[arts] unify KDE 3 autotools fixes between packages

[Kevin Kofler]

commit 1945dafc038c1fa70db6155a76dd18b27e9482b0
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Mar 9 01:28:07 2013 +0100

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

 arts.spec                                          |   30 ++++++++-----------
 arts-acinclude.patch => kde3-acinclude.patch       |    0
 ...e-1.13.patch => kde3-automake-add-missing.patch |    6 ++--
 ...0-automake.patch => kde3-automake-version.patch |   10 +++---
 4 files changed, 21 insertions(+), 25 deletions(-)
---
diff --git a/arts.spec b/arts.spec
index 7e331dd..b3491ad 100644
--- a/arts.spec
+++ b/arts.spec
@@ -3,14 +3,12 @@
 
 %define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
-%define make_cvs 1
-
 Name:    arts
 Summary: aRts (analog realtime synthesizer) - the KDE sound system 
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 20%{?dist}
+Release: 21%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -31,9 +29,6 @@ Patch10: arts-1.5.10-assertion-failure.patch
 # kde#93359
 Patch50: arts-1.5.4-dlopenext.patch
 Patch51: kde-3.5-libtool-shlibext.patch
-# fix build failture with automake-1.13
-patch52: arts-1.5.10-automake-1.13.patch
-
 
 # upstream patches
 
@@ -41,10 +36,13 @@ patch52: arts-1.5.10-automake-1.13.patch
 # CVE-2009-3736 libtool: libltdl may load and execute code from a library in the current directory 
 Patch200: libltdl-CVE-2009-3736.patch
 
+# fixes to common KDE 3 autotools machinery
 # tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
-Patch300: arts-acinclude.patch
-# update for recent automake
-Patch301: arts-1.5.10-automake.patch
+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: arts-1.5.10-automake-1.13.patch
 
 # used in artsdsp
 Requires: which
@@ -52,9 +50,7 @@ Requires: which
 BuildRequires: qt3-devel >= 3.3.8
 BuildRequires: alsa-lib-devel
 BuildRequires: audiofile-devel
-%if %{make_cvs}
 BuildRequires: automake libtool
-%endif
 BuildRequires: findutils sed
 BuildRequires: glib2-devel
 BuildRequires: libvorbis-devel
@@ -102,14 +98,11 @@ Install %{name}-devel if you intend to write applications using aRts.
 %patch200 -p1 -b .CVE-2009-3736
 
 %patch300 -p1 -b .acinclude
-%patch301 -p1 -b .automake
+%patch301 -p1 -b .automake-version
+%patch302 -p1 -b .automake-add-missing
 
 %build
-
-%if %{make_cvs}
-  make -f admin/Makefile.common cvs
-%endif
-
+make -f admin/Makefile.common cvs
 
 unset QTDIR && . /etc/profile.d/qt.sh
 
@@ -205,6 +198,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.10-21
+- unify KDE 3 autotools fixes between packages
+
 * Thu Mar 07 2013 Than Ngo <than at redhat.com> - 1.5.10-20
 - fix FTBFS in rawhide
 
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/arts-1.5.10-automake-1.13.patch b/kde3-automake-add-missing.patch
similarity index 55%
rename from arts-1.5.10-automake-1.13.patch
rename to kde3-automake-add-missing.patch
index 45269bf..9792f70 100644
--- a/arts-1.5.10-automake-1.13.patch
+++ b/kde3-automake-add-missing.patch
@@ -1,6 +1,6 @@
-diff -up arts-1.5.10/admin/cvs.sh.me arts-1.5.10/admin/cvs.sh
---- arts-1.5.10/admin/cvs.sh.me	2013-03-07 18:08:31.003844848 +0100
-+++ arts-1.5.10/admin/cvs.sh	2013-03-07 18:09:07.187488301 +0100
+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
  
diff --git a/arts-1.5.10-automake.patch b/kde3-automake-version.patch
similarity index 58%
rename from arts-1.5.10-automake.patch
rename to kde3-automake-version.patch
index 756d5f6..6ee4e6d 100644
--- a/arts-1.5.10-automake.patch
+++ b/kde3-automake-version.patch
@@ -1,7 +1,7 @@
-diff -up arts-1.5.10/admin/cvs.sh.automake arts-1.5.10/admin/cvs.sh
---- arts-1.5.10/admin/cvs.sh.automake	2008-08-19 22:18:41.000000000 +0200
-+++ arts-1.5.10/admin/cvs.sh	2012-07-04 12:33:15.747586088 +0200
-@@ -63,12 +63,7 @@ esac
+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
@@ -11,7 +11,7 @@ diff -up arts-1.5.10/admin/cvs.sh.automake arts-1.5.10/admin/cvs.sh
 -    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[0-5]*)
++  automake*)
      echo "*** $AUTOMAKE_STRING found."
      UNSERMAKE=no
      ;;