jreznik pushed to arts (epel7). "fix build with automake 1.11.5"

[notifications at fedoraproject.org]

>From e6a91050d79327339be3cc0ac835f3675aeef9f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 4 Jul 2012 12:40:58 +0200
Subject: fix build with automake 1.11.5


diff --git a/arts-1.5.10-automake.patch b/arts-1.5.10-automake.patch
new file mode 100644
index 0000000..756d5f6
--- /dev/null
+++ b/arts-1.5.10-automake.patch
@@ -0,0 +1,17 @@
+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
+ 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*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-5]*)
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;
diff --git a/arts.spec b/arts.spec
index 032a049..42ad6ab 100644
--- a/arts.spec
+++ b/arts.spec
@@ -10,7 +10,7 @@ Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -39,6 +39,8 @@ Patch200: libltdl-CVE-2009-3736.patch
 
 # 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
 
 # used in artsdsp
 Requires: which
@@ -95,12 +97,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
 
 %build
 
 %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
 
@@ -199,6 +200,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Wed Jul 04 2012 Dan Horák <dan[at]danny.cz> - 8:1.5.10-16
+- fix build with automake 1.11.5
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8:1.5.10-15
 - Rebuilt for c++ ABI breakage
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/arts.git/commit/?h=epel7&id=e6a91050d79327339be3cc0ac835f3675aeef9f2