[kdebase3] unify KDE 3 autotools fixes between packages

[Kevin Kofler]

commit 4a30e85c8ec748e1e280e9d20a3f6fe8f41e1914
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Mar 9 02:50:10 2013 +0100

    unify KDE 3 autotools fixes between packages
    
    * Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-25
    - unify KDE 3 autotools fixes between packages

 arts-acinclude.patch => kde3-acinclude.patch       |    0
 ...issing.patch => kde3-automake-add-missing.patch |    0
 kde3-automake-version.patch                        |   17 +++++++++++
 kdebase3.spec                                      |   30 ++++++++++---------
 4 files changed, 33 insertions(+), 14 deletions(-)
---
diff --git a/arts-acinclude.patch b/kde3-acinclude.patch
similarity index 100%
rename from arts-acinclude.patch
rename to kde3-acinclude.patch
diff --git a/automake-missing.patch b/kde3-automake-add-missing.patch
similarity index 100%
rename from automake-missing.patch
rename to kde3-automake-add-missing.patch
diff --git a/kde3-automake-version.patch b/kde3-automake-version.patch
new file mode 100644
index 0000000..6ee4e6d
--- /dev/null
+++ b/kde3-automake-version.patch
@@ -0,0 +1,17 @@
+diff -ur kdelibs-3.5.10/admin/cvs.sh kdelibs-3.5.10-automake-version/admin/cvs.sh
+--- kdelibs-3.5.10/admin/cvs.sh	2008-08-19 22:28:39.000000000 +0200
++++ kdelibs-3.5.10-automake-version/admin/cvs.sh	2012-06-12 01:24:13.000000000 +0200
+@@ -63,12 +63,7 @@
+ AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
+ required_automake_version="1.6.1 or newer"
+ case $AUTOMAKE_STRING in
+-  automake*1.5d* | automake*1.5* | automake*1.5-* )
+-    echo "*** YOU'RE USING $AUTOMAKE_STRING."
+-    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*)
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;
diff --git a/kdebase3.spec b/kdebase3.spec
index 6a53d06..9a32836 100644
--- a/kdebase3.spec
+++ b/kdebase3.spec
@@ -3,7 +3,6 @@
 %define debug 0 
 %define final 1 
 %define redhatify 1
-%define make_cvs 1
 %define arts 1
 %define libs 1
 
@@ -16,7 +15,7 @@
 Name:    kdebase3
 Summary: KDE 3 core files
 Version: 3.5.10
-Release: 24%{?dist}
+Release: 25%{?dist}
 
 # programs: GPLv2, libs: LGPLv2
 License: GPLv2
@@ -70,18 +69,23 @@ Patch31: kdebase-3.5.10-konsolesu-kdesu.patch
 Patch36: kdebase-3.5.9-userdiskmount.patch
 # don't link kcm_colors against libkrdb (and don't call runRdb)
 Patch37: kdebase-3.5.10-libkrdb_dep.patch
-# fix build failure with automake-1.13
-Patch38: automake-missing.patch
 # find the Samba 4 libsmbclient.h using pkg-config (fixes FTBFS)
 Patch39: kdebase-3.5.10-samba4.patch
 
 # http://aseigo.blogspot.com/2008/10/dear-kde3-kdesktop-users.html
 Patch100: kdebase-3.5.10-minicli-decimal-comma.patch
 Patch101: kdebase-3.5.10-ossl-1.x.patch
-Patch102: arts-acinclude.patch
 
 # security fixes
 
+# fixes to common KDE 3 autotools machinery
+# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
+Patch300: kde3-acinclude.patch
+# remove flawed and obsolete automake version check in admin/cvs.sh
+Patch301: kde3-automake-version.patch
+# fix build failure with automake 1.13: add the --add-missing flag
+Patch302: kde3-automake-add-missing.patch
+
 %if 0%{?libs}
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %else
@@ -119,9 +123,7 @@ BuildRequires: pam-devel
 BuildRequires: gettext
 BuildRequires: perl
 BuildRequires: sed
-%if %{make_cvs}
 BuildRequires: automake libtool
-%endif
 BuildRequires: pkgconfig
 BuildRequires: doxygen
 %ifarch %{ix86} x86_64 ia64 ppc ppc64
@@ -235,12 +237,10 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch31 -p1 -b .konsolesu-kdesu
 %patch36 -p1 -b .userdiskmount
 %patch37 -p1 -b .libkrdb_dep
-%patch38 -p1 -b .automake-1.13
 %patch39 -p1 -b .samba4
 
 %patch100 -p1 -b .minicli-decimal-comma
 %patch101 -p1 -b .ossl-1.x
-%patch102 -p1 -b .autoconf
 
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
 # colors is pending on http://bugzilla.redhat.com/443343
@@ -263,11 +263,10 @@ sed -i.omit -e 's|^FONTINST_SUBDIR=kfontinst|#FONTINST_SUBDIR=kfontinst|' \
 # add missing icons for package_games_kids
 install -p -m644 %{SOURCE9} %{SOURCE10} %{SOURCE11} pics/crystalsvg/
 
-%if %{make_cvs}
-# hack/fix for newer automake
-  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-  make -f admin/Makefile.common cvs
-%endif
+%patch300 -p1 -b .acinclude
+%patch301 -p1 -b .automake-version
+%patch302 -p1 -b .automake-add-missing
+make -f admin/Makefile.common cvs
 
 
 %build
@@ -753,6 +752,9 @@ fi
 
 
 %changelog
+* Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-25
+- unify KDE 3 autotools fixes between packages
+
 * Fri Mar 08 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-24
 - reenable samba (kio_smb)
 - find the Samba 4 libsmbclient.h using pkg-config (fixes FTBFS)