rpms/kdewebdev/devel arts-acinclude.patch, NONE, 1.1 kdewebdev.spec, 1.54, 1.55

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdewebdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30172/devel

Modified Files:
	kdewebdev.spec 
Added Files:
	arts-acinclude.patch 
Log Message:
* Fri Jan 22 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-5
- fix FTBFS with autoconf >= 2.64 (#538907)

arts-acinclude.patch:
 acinclude.m4.in |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

--- NEW FILE arts-acinclude.patch ---
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


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- kdewebdev.spec	30 Jul 2009 00:35:13 -0000	1.54
+++ kdewebdev.spec	22 Jan 2010 09:53:08 -0000	1.55
@@ -10,7 +10,7 @@ Name:    kdewebdev
 Summary: Web development applications 
 Epoch:   6
 Version: 3.5.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Url:     http://kdewebdev.org/ 
@@ -26,6 +26,7 @@ Source5: hi48-app-kxsldbg.png
 
 Patch0: javascript.patch
 Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
+Patch2: arts-acinclude.patch
 
 %if %{make_cvs}
 BuildRequires: automake libtool
@@ -99,6 +100,7 @@ Requires: kdelibs3 >= %{version}
 %setup -q -a 1 -a 2 -a 3 -a 4
 %patch0 -p0 -b .javascript
 %patch1 -p1 -b .kxsldbg-icons
+%patch2 -p1 -b .autoconf
 
 install -m644 -p %{SOURCE5} kxsldbg/
 
@@ -217,6 +219,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 22 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-5
+- fix FTBFS with autoconf >= 2.64 (#538907)
+
 * Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.10-4
 - FTBFS kdewebdev-3.5.10-2.fc11 (#511439)