diff options
author | Timothy Pearson <[email protected]> | 2014-10-06 12:16:27 -0500 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2014-10-06 12:16:27 -0500 |
commit | ecd088049d4aa2e8262f4cc1e0ac45e135964229 (patch) | |
tree | 49ed22e9e7852fd3f26854aecf41c96169d59629 /redhat/tde-i18n/tde-3.5.13.2-admin.patch | |
parent | 855439d3f99b0c152c33ae76a06cce9853f9b8dd (diff) | |
parent | 01a7863524342e1aec31679e55d08830cc571066 (diff) | |
download | tde-packaging-ecd088049d4aa2e8262f4cc1e0ac45e135964229.tar.gz tde-packaging-ecd088049d4aa2e8262f4cc1e0ac45e135964229.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/tde-i18n/tde-3.5.13.2-admin.patch')
-rw-r--r-- | redhat/tde-i18n/tde-3.5.13.2-admin.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/redhat/tde-i18n/tde-3.5.13.2-admin.patch b/redhat/tde-i18n/tde-3.5.13.2-admin.patch deleted file mode 100644 index 4b27f5a90..000000000 --- a/redhat/tde-i18n/tde-3.5.13.2-admin.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: b/admin/cvs.sh -=================================================================== ---- a/admin/cvs.sh 2013-05-22 17:34:41.870203477 +0200 -+++ b/admin/cvs.sh 2013-05-22 17:35:08.553206290 +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.11* | automake*1.12*) -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13* ) - 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[MC]_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[MC]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then - echo "*** Creating config.h template" - $AUTOHEADER || exit 1 - touch config.h.in -Index: b/admin/configure.in.min -=================================================================== ---- a/admin/configure.in.min 2013-05-22 17:34:41.878202494 +0200 -+++ b/admin/configure.in.min 2013-05-22 17:34:43.385704000 +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_PROG_CC |