rpms/kdegames/devel kdegames-3.97.0-parallel_devel.patch, NONE, 1.1 kdegames.spec, 1.73, 1.74

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24905/devel

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-3.97.0-parallel_devel.patch 
Log Message:
* Tue Dec 25 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-3
- move libkdegames.so to %%{_libdir}/kde4/devel and patch search order (#426730)

kdegames-3.97.0-parallel_devel.patch:

--- NEW FILE kdegames-3.97.0-parallel_devel.patch ---
diff -ur kdegames-3.97.0/cmake/modules/FindLibKDEGames.cmake kdegames-3.97.0-parallel_devel/cmake/modules/FindLibKDEGames.cmake
--- kdegames-3.97.0/cmake/modules/FindLibKDEGames.cmake	2007-10-03 13:29:30.000000000 +0200
+++ kdegames-3.97.0-parallel_devel/cmake/modules/FindLibKDEGames.cmake	2007-12-25 17:39:58.000000000 +0100
@@ -26,8 +26,8 @@
         set(CMAKE_LIBRARY_PATH ${LIB_INSTALL_DIR})
 	find_library(KDEGAMES_LIBRARY NAMES kdegames
 		PATHS
-		${LIB_INSTALL_DIR}
                 ${KDE4_LIB_DIR}
+		${LIB_INSTALL_DIR}
   		${GNUWIN32_DIR}/lib
 	)
 	set(KDEGAMES_LIBRARY ${KDEGAMES_LIBRARY} CACHE STRING "")


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kdegames.spec	11 Dec 2007 18:47:26 -0000	1.73
+++ kdegames.spec	25 Dec 2007 16:44:13 -0000	1.74
@@ -4,12 +4,14 @@
 Summary: K Desktop Environment 4 - Games 
 Epoch:   6
 Version: 3.97.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games 
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegames-%{version}.tar.bz2
+# Invert the search order for libkdegames to make sure the KDE 4 version is always found first
+Patch0:  kdegames-3.97.0-parallel_devel.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -76,6 +78,7 @@
 
 %prep
 %setup -q -n kdegames-%{version}
+%patch0 -p1 -b .parallel_devel
 
 
 %build
@@ -94,6 +97,14 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+# move conflicting devel symlink
+mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
+pushd %{buildroot}%{_kde4_libdir}
+linktarget=`readlink "libkdegames.so"`
+rm -f "libkdegames.so"
+ln -sf "../../$linktarget" "kde4/devel/libkdegames.so"
+popd
+
 
 %post
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
@@ -135,9 +146,13 @@
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
+%{_kde4_libdir}/kde4/devel/libkdegames.so
 
 
 %changelog
+* Tue Dec 25 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-3
+- move libkdegames.so to %%{_libdir}/kde4/devel and patch search order (#426730)
+
 * Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-2
 - rebuild for changed _kde4_includedir