diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-06-24 20:04:29 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-06-24 20:04:29 +0200 |
| commit | 7d2530b3a09c48df5070a9fbddb20dda9d6ba213 (patch) | |
| tree | 75179ad523e4c7e0befd199223dfeee374813f86 /redhat/extras/kickoff-i18n | |
| parent | fd19f6bf3d8b5bfa11600f83adb51e75c0404105 (diff) | |
| download | tde-packaging-7d2530b3a09c48df5070a9fbddb20dda9d6ba213.tar.gz tde-packaging-7d2530b3a09c48df5070a9fbddb20dda9d6ba213.zip | |
RPM Packaging: misc updates for 3.5.13.2
Diffstat (limited to 'redhat/extras/kickoff-i18n')
| -rw-r--r-- | redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch b/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch index 3f8ec4139..36ac3d807 100644 --- a/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch +++ b/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch @@ -1,11 +1,40 @@ ---- kickoff-i18n-1.0/admin/cvs.sh.ORI 2012-08-03 21:16:36.104888893 +0200 -+++ kickoff-i18n-1.0/admin/cvs.sh 2012-08-03 21:16:54.488505909 +0200 +--- kickoff-i18n-1.0/admin/configure.in.min.ORI 2013-06-04 21:34:45.145197643 +0200 ++++ kickoff-i18n-1.0/admin/configure.in.min 2013-06-04 21:34:54.004020422 +0200 +@@ -41,7 +41,7 @@ + KDE_SET_PREFIX + + dnl generate the config header +-AM_CONFIG_HEADER(config.h) dnl at the distribution this done ++AC_CONFIG_HEADER(config.h) dnl at the distribution this done + + dnl Checks for programs. + AC_CHECK_COMPILERS +--- kickoff-i18n-1.0/admin/cvs.sh.automake 2007-01-15 10:06:45.000000000 +0100 ++++ kickoff-i18n-1.0/admin/cvs.sh 2013-06-04 21:34:39.471311140 +0200 @@ -68,7 +68,7 @@ echo "*** KDE requires automake $required_automake_version" exit 1 ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]*) ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*) echo "*** $AUTOMAKE_STRING found." UNSERMAKE=no ;; +@@ -128,7 +128,7 @@ + echo "*** Creating configure" + call_and_fix_autoconf + +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + touch config.h.in +@@ -184,7 +184,7 @@ + fi + fi + $ACLOCAL $ACLOCALFLAGS +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + touch config.h.in |