rpms/kdenetwork/F-8 kdenetwork.spec,1.104,1.105

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdenetwork.spec 
Log Message:
* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-3
- -libs: Obsoletes: %name ... to help out multilib upgrades



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-8/kdenetwork.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- kdenetwork.spec	16 Oct 2007 13:24:54 -0000	1.104
+++ kdenetwork.spec	25 Oct 2007 19:49:04 -0000	1.105
@@ -16,10 +16,15 @@
 %define final 1
 %define make_cvs 1
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 Name:    kdenetwork
 Epoch:   7
 Version: 3.5.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment - Network Applications
 
 License: GPLv2
@@ -42,7 +47,13 @@
 # include more/proper ppp headers
 Patch5: kdenetwork-3.5.7-ppp.patch
 
+%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(preun):  chkconfig
 Requires(post):   /sbin/ldconfig chkconfig
 Requires(postun): /sbin/ldconfig
@@ -123,15 +134,18 @@
  * nowlistening (xmms) plugin for Kopete.
 %endif
 
+%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs3 >= %{version}
+# 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
@@ -443,8 +457,12 @@
 
 
 %changelog
+* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-3
+- -libs: Obsoletes: %%name ... to help out multilib upgrades
+
 * Sun Oct 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.8-2
 - -libs: %%post/%%postun -p /sbin/ldconfig
+- -libs conditional (f8+)
 
 * Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.8-1
 - kde-3.5.8