From 751c632cc65a32b282e8f3bfe8838d5f61993287 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sep 18 2008 16:16:55 +0000 Subject: - drop no longer needed devel symlink hacks --- diff --git a/kdegames-3.97.0-parallel_devel.patch b/kdegames-3.97.0-parallel_devel.patch deleted file mode 100644 index bb31b6d..0000000 --- a/kdegames-3.97.0-parallel_devel.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 "") diff --git a/kdegames.spec b/kdegames.spec index 78d83a1..b755a53 100644 --- a/kdegames.spec +++ b/kdegames.spec @@ -5,7 +5,7 @@ Name: kdegames 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 @@ Group: Amusements/Games 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 @@ game applications for KDE 4. %prep %setup -q -n kdegames-%{version} -%patch0 -p1 -b .parallel_devel %build @@ -109,14 +105,6 @@ rm -rf %{buildroot} 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 @@ rm -rf %{buildroot} %{_kde4_appsdir}/cmake/modules/* %{_kde4_includedir}/* %{_kde4_libdir}/lib*.so -%{_kde4_libdir}/kde4/devel/libkdegames.so %changelog +* Thu Sep 18 2008 Kevin Kofler 4.1.1-2 +- drop no longer needed devel symlink hacks + * Fri Aug 29 2008 Than Ngo 4.1.1-1 - 4.1.1