rpms/kdebase3/F-12 arts-acinclude.patch, NONE, 1.1 kdebase3.spec, 1.88, 1.89

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase3/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25381

Modified Files:
	kdebase3.spec 
Added Files:
	arts-acinclude.patch 
Log Message:
* Thu Jun 10 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-17
- drop old Obsoletes/Provides: kdebase(-devel)


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/F-12/kdebase3.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- kdebase3.spec	4 Sep 2009 22:45:44 -0000	1.88
+++ kdebase3.spec	11 Jun 2010 17:21:33 -0000	1.89
@@ -10,17 +10,14 @@
 %define _with_libutempter 1
 %define _with_samba --with-samba
 
-Version: 3.5.10
-Release: 14%{?dist}
-
-Name: kdebase3
-Summary: K Desktop Environment 3 - core files
-Obsoletes: kdebase < 6:%{version}-%{release}
-Provides: kdebase = 6:%{version}-%{release}
-
 # make -pim-ioslaves subpkg
 %define pim 1
 
+Name:    kdebase3
+Summary: KDE 3 core files
+Version: 3.5.10
+Release: 17%{?dist}
+
 # programs: GPLv2, libs: LGPLv2
 License: GPLv2
 Url: http://www.kde.org
@@ -76,6 +73,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
 
@@ -157,20 +155,16 @@ BuildRequires: OpenEXR-devel
 BuildRequires: gtk2-devel
 
 %description
-Core runtime files for the K Desktop Environment 3, for compatibility with KDE 3
-applications.
+Core runtime files for KDE 3, for compatibility with KDE 3 applications.
 
-# FIXME/TODO: Is kdebase3-devel really useful?
 %package devel
 Summary: Development files for %{name}
-Provides: kdebase-devel = 6:%{version}-%{release}
-Obsoletes: kdebase-devel < 6:%{version}-%{release}
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs3-devel
 Group: Development/Libraries
 %description devel
 Header files for developing applications using %{name}.
-Install kdebase-devel if you want to develop or compile Konqueror,
+Install %{name}-devel if you want to develop or compile Konqueror,
 Kate plugins or KWin styles.
 
 %if 0%{?extras}
@@ -191,10 +185,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs3 >= %{version}
-Obsoletes: kdebase-libs < 6:%{version}-%{release}
-Provides: kdebase-libs = 6:%{version}-%{release}
-# helps multilib upgrades
-Obsoletes: kdebase < 6:%{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
@@ -245,6 +235,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
@@ -758,6 +749,15 @@ fi
 
 
 %changelog
+* Thu Jun 10 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-17
+- drop old Obsoletes/Provides: kdebase(-devel)
+
+* 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)
+
 * Fri Sep 04 2009 Than Ngo <than at redhat.com> - 3.5.10-14
 - openssl-1.0 build fixes