rpms/kdegames/devel kdegames-4.3.80-fix-libloscript-link.patch, NONE, 1.1 kdegames.spec, 1.155, 1.156

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.3.80-fix-libloscript-link.patch 
Log Message:
* Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
- fix liblogine and libloscript to link (upstream patches)
- update description to list new games

kdegames-4.3.80-fix-libloscript-link.patch:
 CMakeLists.txt        |    5 ++---
 script/CMakeLists.txt |    5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE kdegames-4.3.80-fix-libloscript-link.patch ---
Index: ksudoku/engine/script/CMakeLists.txt
===================================================================
--- ksudoku/engine/script/CMakeLists.txt	(revision 1058758)
+++ ksudoku/engine/script/CMakeLists.txt	(revision 1058759)
@@ -1,6 +1,8 @@
 include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}
+	${QT_QTCORE_INCLUDE_DIR}
+	${QT_QTSCRIPT_INCLUDE_DIR}
 )
 
 set(loscript_SRCS
@@ -17,8 +19,9 @@
 
 qt4_automoc(${loscript_SRCS})
 
-add_library(loscript ${loscript_SRCS})
+kde4_add_library(loscript STATIC ${loscript_SRCS})
 
 target_link_libraries(loscript
 	logine
+	${QT_QTSCRIPT_LIBRARY}
 )
Index: ksudoku/engine/CMakeLists.txt
===================================================================
--- ksudoku/engine/CMakeLists.txt	(revision 1058758)
+++ ksudoku/engine/CMakeLists.txt	(revision 1058759)
@@ -1,6 +1,7 @@
 include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}
+	${QT_QTCORE_INCLUDE_DIR}
 )
 
 set(liblogine_SRCS
@@ -21,12 +22,10 @@
 
 qt4_automoc(${liblogine_SRCS})
 
-add_library(logine ${liblogine_SRCS})
+kde4_add_library(logine STATIC ${liblogine_SRCS})
 
 target_link_libraries(logine
-	${QT_LIBRARIES}
 	${QT_QTCORE_LIBRARY}
-	${QT_QTSCRIPT_LIBRARY}
 )
 
 add_subdirectory(script)


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- kdegames.spec	11 Dec 2009 22:57:09 -0000	1.155
+++ kdegames.spec	11 Dec 2009 23:46:00 -0000	1.156
@@ -19,9 +19,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # more, but don't use "Tron" in them! -- Kevin
 Patch0: kdegames-4.3.80-trademarks.patch
 
-# upstream patch from 4.4 trunk (Nicolas Lécureuil)
-# fix liblogine to link: http://websvn.kde.org/?view=revision&revision=1058294
+# upstream patches from 4.4 trunk
+# fix liblogine to link (Nicolas Lécureuil):
+# http://websvn.kde.org/?view=revision&revision=1058294
 Patch100: kdegames-4.3.80-fix-liblogine-link.patch
+# make liblogine and libloscript static, fixes libloscript to link (Funda Wang)
+# http://websvn.kde.org/?view=revision&revision=1058759
+Patch101: kdegames-4.3.80-fix-libloscript-link.patch
 
 # KSnakeDuel moved here from kdegames3
 Conflicts: kdegames3 < 3.5.10-6
@@ -53,6 +57,7 @@ Requires(preun): ggz-client-libs
 Games for the K Desktop Environment 4, including:
 * bomber
 * bovo
+* granatier
 * kapman
 * katomic
 * kblackbox
@@ -62,6 +67,7 @@ Games for the K Desktop Environment 4, i
 * kdiamond
 * kfourinline
 * kgoldrunner
+* kigo
 * killbots
 * kiriki
 * kjumpingcube
@@ -87,6 +93,7 @@ Games for the K Desktop Environment 4, i
 * ktuberling
 * kubrick
 * lskat
+* palapeli
 
 %package libs
 Summary: Runtime libraries for %{name}
@@ -110,6 +117,7 @@ game applications for KDE 4.
 %setup -q -n kdegames-%{version}%{?alphatag}
 %patch0 -p1 -b .trademarks
 %patch100 -p0 -b .fix-liblogine-link
+%patch101 -p0 -b .fix-libloscript-link
 
 %build
 # trademarks issue in RHEL
@@ -141,6 +149,9 @@ install -m644 -p -D ./kreversi/module.ds
 install -m644 -p -D ./ksquares/src/module.dsc %{buildroot}%{_ggz_datadir}/ksquares.dsc
 %endif
 
+# don't ship internal static libraries
+rm -f %{buildroot}%{_kde4_libdir}/liblo{gine,script}.a
+
 
 %check
 for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -221,9 +232,6 @@ rm -rf %{buildroot}
 %else
 %{_ggz_configdir}/ggz.modules.d/kdegames
 %endif
-# unversioned libraries
-%{_kde4_libdir}/liblogine.so
-%{_kde4_libdir}/libloscript.so
 
 %files libs
 %defattr(-,root,root,-)
@@ -235,15 +243,12 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-# unversioned libraries
-%exclude %{_kde4_libdir}/liblogine.so
-%exclude %{_kde4_libdir}/libloscript.so
 
 
 %changelog
 * Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
-- fix liblogine to link (upstream patch)
-- fix file list for unversioned internal liblogine.so and libloscript.so libs
+- fix liblogine and libloscript to link (upstream patches)
+- update description to list new games
 
 * Tue Dec 01 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)