rpms/kdebase3/devel arts-acinclude.patch, NONE, 1.1 kdebase3.spec, 1.90, 1.91

[Kevin Kofler]

Author: kkofler

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

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

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: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- kdebase3.spec	16 Dec 2009 17:05:11 -0000	1.90
+++ kdebase3.spec	22 Jan 2010 09:47:56 -0000	1.91
@@ -11,7 +11,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 Name: kdebase3
 Summary: KDE 3 core files
@@ -76,6 +76,7 @@ Patch37: kdebase-3.5.10-libkrdb_dep.patc
 # http://aseigo.blogspot.com/2008/10/dear-kde3-kdesktop-users.html
 Patch100: kdebase-3.5.10-minicli-decimal-comma.patch
 Patch101: kdebase-3.5.10-ossl-1.x.patch
+Patch102: arts-acinclude.patch
 
 # security fixes
 
@@ -244,6 +245,7 @@ Protocol handlers (KIOslaves) for person
 %patch37 -p1 -b .libkrdb_dep
 %patch100 -p1 -b .minicli-decimal-comma
 %patch101 -p1 -b .ossl-1.x
+%patch102 -p1 -b .autoconf
 
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
 # colors is pending on http://bugzilla.redhat.com/443343
@@ -757,6 +759,9 @@ fi
 
 
 %changelog
+* Fri Jan 22 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-16
+- fix FTBFS with autoconf >= 2.64 (#539110)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 3.5.10-15
 - Repositioning the KDE Brand (#547361)