jreznik pushed to arts (epel7). "- patch autoconfigury to build with autoconf >= 2.64"

[notifications at fedoraproject.org]

>From 118214f37d9cc91953f56857de46aedfc7d4be4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= <kasal at fedoraproject.org>
Date: Thu, 10 Dec 2009 16:18:45 +0000
Subject: - patch autoconfigury to build with autoconf >= 2.64


diff --git a/arts-acinclude.patch b/arts-acinclude.patch
new file mode 100644
index 0000000..0610d6d
--- /dev/null
+++ b/arts-acinclude.patch
@@ -0,0 +1,66 @@
+2009-12-10  Stepan Kasal  <skasal at redhat.com>
+
+The change of implementation of AC_REQUIRE in 2.64 caused a regression
+in the arts project.
+This can be fixed by shuffling some macro calls.
+
+I suppose that most of this patch will not be needed with a future
+release of Autoconf.
+But the last chunk of this patch is a real bug in this source and
+should go upstream.
+
+--- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
++++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
+@@ -3081,8 +3081,18 @@
+ fi
+ ])
+ 
++AC_DEFUN([AC_CHECK_COMPILERS_CC],
++[ 
++  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
++  CFLAGS=" $CFLAGS"
++  AC_PROG_CC
++  CXXFLAGS=" $CXXFLAGS"
++  AC_PROG_CXX
++])
++
+ AC_DEFUN([AC_CHECK_COMPILERS],
+ [
++  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
+   AC_ARG_ENABLE(debug,
+ 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
+   [
+@@ -3141,11 +3151,6 @@
+     [kde_use_profiling="no"]
+   )
+ 
+-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+-  CFLAGS=" $CFLAGS"
+-
+-  AC_PROG_CC 
+-
+   AC_PROG_CPP
+ 
+   if test "$GCC" = "yes"; then
+@@ -3174,10 +3179,6 @@
+      LDFLAGS=""
+   fi
+ 
+-  CXXFLAGS=" $CXXFLAGS"
+-
+-  AC_PROG_CXX
+-
+   KDE_CHECK_FOR_BAD_COMPILER
+ 
+   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
+@@ -3503,8 +3504,8 @@
+ AC_REQUIRE([AC_LIBTOOL_DLOPEN])
+ AC_REQUIRE([KDE_CHECK_LIB64])
+ 
+-AC_OBJEXT
+-AC_EXEEXT
++AC_REQUIRE([AC_OBJEXT])
++AC_REQUIRE([AC_EXEEXT])
+ 
+ AM_PROG_LIBTOOL
+ AC_LIBTOOL_CXX
diff --git a/arts.spec b/arts.spec
index 7ed0a69..2a6aae0 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: 9%{?dist}
+Release: 10%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -33,6 +33,9 @@ Patch51: kde-3.5-libtool-shlibext.patch
 # CVE-2009-3736 libtool: libltdl may load and execute code from a library in the current directory 
 Patch200: libltdl-CVE-2009-3736.patch
 
+# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
+Patch300: arts-acinclude.patch
+
 # used in artsdsp
 Requires: which
 
@@ -85,6 +88,10 @@ Install %{name}-devel if you intend to write applications using aRts.
 
 %patch200 -p1 -b .CVE-2009-3736
 
+%patch300 -p1 -b .acinclude
+
+%build
+
 %if %{make_cvs}
 # hack/fix for newer automake
   sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
@@ -92,7 +99,6 @@ Install %{name}-devel if you intend to write applications using aRts.
 %endif
 
 
-%build
 unset QTDIR && . /etc/profile.d/qt.sh
 
 %configure \
@@ -187,6 +193,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Thu Dec 10 2009 Stepan Kasal <skasal at redhat.com> - 1.5.10-10
+- patch autoconfigury to build with autoconf >= 2.64
+
 * Sun Dec 06 2009 Than Ngo <than at redhat.com> - 1.5.10-9
 - fix url
 - fix security issues in libltdl (CVE-2009-3736)
-- 
cgit v0.10.2


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