rpms/kdegames/devel kdegames.spec, 1.102, 1.103 kdegames-3.97.0-parallel_devel.patch, 1.1, NONE

Kevin Kofler kkofler at fedoraproject.org
Thu Sep 18 16:17:25 UTC 2008


Author: kkofler

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

Modified Files:
	kdegames.spec 
Removed Files:
	kdegames-3.97.0-parallel_devel.patch 
Log Message:
* Thu Sep 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
- drop no longer needed devel symlink hacks


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- kdegames.spec	3 Sep 2008 09:48:17 -0000	1.102
+++ kdegames.spec	18 Sep 2008 16:16:55 -0000	1.103
@@ -5,7 +5,7 @@
 Summary: K Desktop Environment 4 - Games 
 Epoch:   6
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -13,9 +13,6 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegames-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# 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
-
 Obsoletes: kdegames4 < %{version}-%{release}
 Provides:  kdegames4 = %{version}-%{release}
 
@@ -91,7 +88,6 @@
 
 %prep
 %setup -q -n kdegames-%{version}
-%patch0 -p1 -b .parallel_devel
 
 
 %build
@@ -109,14 +105,6 @@
 
 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
-
 # HACK, FIXME
 install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc
 install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{_ggz_datadir}/kreversi.dsc
@@ -184,10 +172,12 @@
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-%{_kde4_libdir}/kde4/devel/libkdegames.so
 
 
 %changelog
+* Thu Sep 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
+- drop no longer needed devel symlink hacks
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1
 


--- kdegames-3.97.0-parallel_devel.patch DELETED ---




More information about the fedora-extras-commits mailing list