rpms/kdenetwork/devel kdenetwork.spec,1.104,1.105

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Oct 25 15:43:32 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10238

Modified Files:
	kdenetwork.spec 
Log Message:
-libs conditional (f8+)



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/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 15:42:58 -0000	1.105
@@ -16,6 +16,11 @@
 %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
@@ -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,6 +134,7 @@
  * nowlistening (xmms) plugin for Kopete.
 %endif
 
+%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
@@ -131,7 +143,7 @@
 #Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
-
+%endif
 
 
 %prep
@@ -445,6 +457,7 @@
 %changelog
 * 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




More information about the fedora-extras-commits mailing list