rpms/kdegames3/devel arts-acinclude.patch, NONE, 1.1 kdegames-3.5.10-ftbfs.patch, NONE, 1.1 kdegames3.spec, 1.15, 1.16

Mon Feb 15 15:52:44 UTC 2010

Author: kkofler

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

Modified Files:
	kdegames3.spec 
Added Files:
	arts-acinclude.patch kdegames-3.5.10-ftbfs.patch 
Log Message:
* Mon Feb 15 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-8
- enable "make_cvs" (as in other KDE 3 stuff) so we can patch Makefile.am
- fix build with make_cvs enabled and automake >= 1.11
- fix build with make_cvs enabled and autoconf >= 2.64
- fix FTBFS with the new stricter ld in F13 (#565113)

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

kdegames-3.5.10-ftbfs.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdegames-3.5.10-ftbfs.patch ---
diff -ur kdegames-3.5.10/libksirtet/base/Makefile.am kdegames-3.5.10-ftbfs/libksirtet/base/Makefile.am
--- kdegames-3.5.10/libksirtet/base/Makefile.am	2005-10-10 16:56:23.000000000 +0200
+++ kdegames-3.5.10-ftbfs/libksirtet/base/Makefile.am	2010-02-15 16:49:34.000000000 +0100
@@ -7,6 +7,7 @@
 
 noinst_LTLIBRARIES        = libksirtetbase.la
 libksirtetbase_la_LDFLAGS = $(all_libraries)
+libksirtetbase_la_LDADD   = -lkio
 
 noinst_HEADERS            = kzoommainwindow.h piece.h gtetris.h factory.h highscores.h \
                             board.h settings.h field.h inter.h main.h


Index: kdegames3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames3/devel/kdegames3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kdegames3.spec	16 Dec 2009 17:07:25 -0000	1.15
+++ kdegames3.spec	15 Feb 2010 15:52:44 -0000	1.16
@@ -1,7 +1,7 @@
 
 %define debug 0
 %define final 0
-%define make_cvs 0
+%define make_cvs 1
 
 # These games are already in KDE 4.
 %define donotcompilelist katomic kbattleship kblackbox kbounce kgoldrunner kjumpingcube klines kmahjongg kmines knetwalk kolf konquest kpat kreversi ksame kshisen kspaceduel ktron ktuberling kwin4 lskat
@@ -9,7 +9,7 @@
 Name:    kdegames3
 Summary: KDE 3 Games not ported to KDE 4
 Version: 3.5.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
@@ -17,6 +17,10 @@ Url:     http://www.kde.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
 Patch0: kdegames-3.5.10-trademarks.patch
+# fix build with make_cvs enabled and autoconf >= 2.64
+Patch1: arts-acinclude.patch
+# fix FTBFS with the new stricter ld in F13 (#565113)
+Patch2: kdegames-3.5.10-ftbfs.patch
 
 Requires: kdelibs3 >= %{version}
 # directory ownership
@@ -58,10 +62,14 @@ License: LGPLv2
 %prep
 %setup -q -n kdegames-%{version}
 %patch0 -p1
+%patch1 -p1 -b .autoconf
+%patch2 -p1 -b .ftbfs
 
 export DO_NOT_COMPILE="%{donotcompilelist}"
 %if %{make_cvs}
-   make -f admin/Makefile.common 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
 
 
@@ -188,6 +196,12 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Mon Feb 15 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-8
+- enable "make_cvs" (as in other KDE 3 stuff) so we can patch Makefile.am
+- fix build with make_cvs enabled and automake >= 1.11
+- fix build with make_cvs enabled and autoconf >= 2.64
+- fix FTBFS with the new stricter ld in F13 (#565113)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 3.5.10-7
 - Repositioning the KDE Brand (#547361)
 

