rpms/kdegames/devel kdegames-4.3.80-fix-liblogine-link.patch, NONE, 1.1 kdegames.spec, 1.154, 1.155

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.3.80-fix-liblogine-link.patch 
Log Message:
* 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

kdegames-4.3.80-fix-liblogine-link.patch:
 CMakeLists.txt |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kdegames-4.3.80-fix-liblogine-link.patch ---
Index: ksudoku/engine/CMakeLists.txt
===================================================================
--- ksudoku/engine/CMakeLists.txt	(revision 1058293)
+++ ksudoku/engine/CMakeLists.txt	(revision 1058294)
@@ -25,6 +25,8 @@
 
 target_link_libraries(logine
 	${QT_LIBRARIES}
+	${QT_QTCORE_LIBRARY}
+	${QT_QTSCRIPT_LIBRARY}
 )
 
-add_subdirectory(script)
\ No newline at end of file
+add_subdirectory(script)


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- kdegames.spec	11 Dec 2009 18:55:20 -0000	1.154
+++ kdegames.spec	11 Dec 2009 22:57:09 -0000	1.155
@@ -2,7 +2,7 @@ Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -19,6 +19,10 @@ 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
+Patch100: kdegames-4.3.80-fix-liblogine-link.patch
+
 # KSnakeDuel moved here from kdegames3
 Conflicts: kdegames3 < 3.5.10-6
 
@@ -105,6 +109,7 @@ game applications for KDE 4.
 %prep
 %setup -q -n kdegames-%{version}%{?alphatag}
 %patch0 -p1 -b .trademarks
+%patch100 -p0 -b .fix-liblogine-link
 
 %build
 # trademarks issue in RHEL
@@ -216,6 +221,9 @@ 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,-)
@@ -227,10 +235,17 @@ 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
-* Tue Dec  1 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
+* 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
+
+* Tue Dec 01 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 
 * Sun Nov 22 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
@@ -743,6 +758,3 @@ rm -rf %{buildroot}
 
 * Wed Mar 27 2002 Than Ngo <than at redhat.com> 3.0.0-1
 - final
-
-
-