[kdewebdev] unify KDE 3 autotools fixes between packages

[Kevin Kofler]

commit 120f4d2e9cf6b17fb610d4072541b97d096b6a5d
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Mar 9 03:03:38 2013 +0100

    unify KDE 3 autotools fixes between packages
    
    * Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-19
    - 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 ++++++++++
 kdewebdev.spec                                     |   32 ++++++++++----------
 4 files changed, 33 insertions(+), 16 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/kdewebdev.spec b/kdewebdev.spec
index 9c39e0f..24e6a44 100644
--- a/kdewebdev.spec
+++ b/kdewebdev.spec
@@ -1,11 +1,8 @@
-
-%define make_cvs 1
-
 Name:    kdewebdev
 Summary: Web development applications 
 Epoch:   6
 Version: 3.5.10
-Release: 18%{?dist}
+Release: 19%{?dist}
 
 License: GPLv2
 Url:     http://kdewebdev.org/ 
@@ -21,20 +18,23 @@ Source5: hi48-app-kxsldbg.png
 
 Patch0: javascript.patch
 Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
-Patch2: arts-acinclude.patch
 # fixes crash in kimagemapeditor when using freehand tool
 Patch3: kdewebdev-3.5.10-fix-freehand-crash.patch
 # fixes using a temporary as a lvalue in KafkaPart (FTBFS with g++ 4.6, probably
 # silently did the wrong thing before)
 Patch4: kdewebdev-3.5.10-gcc46.patch
-# fix build failure with automake-1.13
-Patch5: automake-missing.patch
 # docbParseFile is dropped in libxml2-2.9 amd later
 Patch6: kdewebdev-3.5.10-docbParseFile.patch
 
-%if %{make_cvs}
+# 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
+
 BuildRequires: automake libtool
-%endif
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: libxslt-devel libxml2-devel
@@ -89,19 +89,16 @@ Requires: kdelibs3%{?_isa} >= %{version}
 %setup -q -a 1 -a 2 -a 3 -a 4
 %patch0 -p0 -b .javascript
 %patch1 -p1 -b .kxsldbg-icons
-%patch2 -p1 -b .autoconf
 %patch3 -p1 -b .fix-freehand-crash
 %patch4 -p1 -b .gcc46
-%patch5 -p1 -b .automake
 %patch6 -p1 -b .docbParseFile
 
 install -m644 -p %{SOURCE5} kxsldbg/
 
-%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
@@ -212,6 +209,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-19
+- unify KDE 3 autotools fixes between packages
+
 * Fri Mar 08 2013 Than Ngo <than at redhat.com> - 3.5.10-18
 - fix build failure with libxml2-2.9