[kdegames3] unify KDE 3 autotools fixes between packages

[Kevin Kofler]

commit 29bb41dee2e8768590691fb0cee18a9611bf24c1
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Mar 9 03:11:01 2013 +0100

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

 arts-acinclude.patch => kde3-acinclude.patch |    0
 kde3-automake-add-missing.patch              |   12 ++++++++++
 kde3-automake-version.patch                  |   17 +++++++++++++++
 kdegames3.spec                               |   29 +++++++++++++++----------
 4 files changed, 46 insertions(+), 12 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/kde3-automake-add-missing.patch b/kde3-automake-add-missing.patch
new file mode 100644
index 0000000..9792f70
--- /dev/null
+++ b/kde3-automake-add-missing.patch
@@ -0,0 +1,12 @@
+diff -up kdelibs-3.5.10/admin/cvs.sh.me kdelibs-3.5.10/admin/cvs.sh
+--- kdelibs-3.5.10/admin/cvs.sh.me	2013-03-07 18:31:59.415038395 +0100
++++ kdelibs-3.5.10/admin/cvs.sh	2013-03-07 18:32:26.565020369 +0100
+@@ -130,7 +130,7 @@ if egrep "^AM_CONFIG_HEADER" configure.i
+ fi
+ 
+ echo "*** Creating Makefile templates"
+-$AUTOMAKE || exit 1
++$AUTOMAKE --add-missing || exit 1
+ 
+ if test "$UNSERMAKE" = no; then
+   echo "*** Postprocessing Makefile templates"
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/kdegames3.spec b/kdegames3.spec
index 72fde7a..cdbfde9 100644
--- a/kdegames3.spec
+++ b/kdegames3.spec
@@ -1,7 +1,6 @@
 
 %define debug 0
 %define final 0
-%define make_cvs 1
 
 # These games are already in KDE 4.
 %define donotcompilelist katomic kbattleship kblackbox kbounce kgoldrunner kjumpingcube klickety klines kmahjongg kmines knetwalk kolf konquest kpat kreversi ksame kshisen kspaceduel ktron ktuberling kwin4 lskat
@@ -9,7 +8,7 @@
 Name:    kdegames3
 Summary: KDE 3 Games not ported to KDE 4
 Version: 3.5.10
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
@@ -17,11 +16,17 @@ Url:     http://www.kde.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
 Patch0: kdegames-3.5.10-trademarks.patch
-# fix build with make_cvs enabled and autoconf >= 2.64
-Patch1: arts-acinclude.patch
 # fix FTBFS with the new stricter ld in F13 (#565113)
 Patch2: kdegames-3.5.10-ftbfs.patch
 
+# 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
+
 Requires: kdelibs3 >= %{version}
 # directory ownership
 Requires: hicolor-icon-theme kde-filesystem
@@ -31,9 +36,7 @@ Conflicts: kdegames < 6:3.80
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 BuildRequires: kdelibs3-devel >= %{version}
-%if %{make_cvs}
 BuildRequires: automake libtool
-%endif
 
 %description
 Games and gaming libraries for KDE which have not been ported to KDE 4 yet.
@@ -62,15 +65,14 @@ License: LGPLv2
 %prep
 %setup -q -n kdegames-%{version}
 %patch0 -p1
-%patch1 -p1 -b .autoconf
 %patch2 -p1 -b .ftbfs
 
 export DO_NOT_COMPILE="%{donotcompilelist}"
-%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
@@ -196,6 +198,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-15
+- unify KDE 3 autotools fixes between packages
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild