rpms/kdebase/F-8 kdebase.spec,1.272,1.273

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdebase.spec 
Log Message:
* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-4
- -libs: Obsoletes: %name ... to help out multilib upgrades
- -libs conditional (f8+)



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/kdebase.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- kdebase.spec	15 Oct 2007 21:15:06 -0000	1.272
+++ kdebase.spec	25 Oct 2007 20:56:34 -0000	1.273
@@ -9,11 +9,16 @@
 
 %define arts 1
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 Summary: K Desktop Environment - core files
 Name:    kdebase
 Epoch:   6
 Version: 3.5.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # programs: GPLv2, libs: LGPLv2
 License: GPLv2
@@ -75,11 +80,17 @@
 
 Provides: kdebase3 = %{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
 Requires(post): coreutils fileutils
 Requires(postun): coreutils fileutils
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} 
 # See http://bugzilla.redhat.com/191306
 Requires(hint): htdig
 # man2html
@@ -200,15 +211,18 @@
  * ktip
  * kpersonalizer
 
+%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs3 >= %{version}
-# paranoia, installing libs-only is still mostly untested -- Rex
+# helps multilib upgrades
+Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
-
+%endif
 
 
 %prep
@@ -427,18 +441,22 @@
 
 
 %post
+%{!?libs:/sbin/ldconfig}
 touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg  2> /dev/null || :
 %{_bindir}/update-desktop-database 2> /dev/null || : 
 
 %postun
+%{!?libs:/sbin/ldconfig}
 touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg  2> /dev/null || :
 %{_bindir}/update-desktop-database 2> /dev/null || : 
 
+%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
+%endif
 
 %post extras
 for f in crystalsvg hicolor ; do
@@ -636,6 +654,13 @@
 %{_datadir}/templates/.source/*
 %{_datadir}/wallpapers/*
 
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*.h
@@ -650,13 +675,12 @@
 %{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit_*.so
 
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-
 
 %changelog
+* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-4
+- -libs: Obsoletes: %%name ... to help out multilib upgrades
+- -libs conditional (f8+)
+
 * Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-3
 - respin (for openexr-1.6.0)
 - -libs: %%post/%%postun /sbin/ldconfig