rpms/kdegames/F-8 kdegames.spec,1.63,1.64

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6411

Modified Files:
	kdegames.spec 
Log Message:
* Wed Oct 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-3
- -libs conditional (f8+)
- -libs: %%post/%%postun -p /sbin/ldconfig

* Sun Oct 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-2
- fix/update trademarks patch




Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-8/kdegames.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdegames.spec	13 Oct 2007 18:39:39 -0000	1.63
+++ kdegames.spec	25 Oct 2007 02:40:29 -0000	1.64
@@ -3,11 +3,16 @@
 %define final 1 
 %define make_cvs 0
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 Name:    kdegames
 Summary: K Desktop Environment - Games
 Epoch:   6
 Version: 3.5.8
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
@@ -16,11 +21,17 @@
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch0: kdegames-3.1.1-konquest.patch
-Patch1: kdegames-3.5.7-trademarks.patch
+Patch1: kdegames-3.5.8-trademarks.patch
 
 Provides: kdegames3 = %{version}-%{release}
 
+%if 0%{?libs}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -47,6 +58,7 @@
 Install %{name}-devel if you wish to develop or compile games for the
 KDE desktop.
 
+%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
@@ -56,6 +68,7 @@
 #Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
+%endif
 
 
 
@@ -126,7 +139,7 @@
 
 
 %post
-/sbin/ldconfig
+%{!?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -134,13 +147,19 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-/sbin/ldconfig
+%{!?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -157,6 +176,13 @@
 %{_libdir}/kde3/*
 %{_libdir}/libkdeinit_*.so
 
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
 %files devel
 %defattr(-,root,root,-)
 %doc COPYING.LIB
@@ -165,18 +191,20 @@
 %{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit_*.so
 
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-
 
 %changelog
-* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.8-1
+* Wed Oct 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-3 
+- -libs conditional (f8+)
+- -libs: %%post/%%postun -p /sbin/ldconfig
+
+* Sun Oct 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-2
+- fix/update trademarks patch
+
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-1
 - kde-3.5.8
 - libs subpkg (more multilib friendly)
 
-* Thu Sep 20 2007 Than Ngo <than at redhat.com> 3.5.7-4
+* Thu Sep 20 2007 Than Ngo <than at redhat.com> 6:3.5.7-4
 - bz248343, remove the Tron and Sokoban trademarks, thanks to Kevin Kofler
 
 * Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3