rpms/kdenetwork/devel kdenetwork.spec,1.106,1.107

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue Oct 30 15:14:48 UTC 2007


Author: rdieter

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

Modified Files:
	kdenetwork.spec 
Log Message:
* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-4
- libs: Requires: %{name}... (multilib upgrades)
- fixup scriptlets



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- kdenetwork.spec	25 Oct 2007 19:46:18 -0000	1.106
+++ kdenetwork.spec	30 Oct 2007 15:13:42 -0000	1.107
@@ -24,7 +24,7 @@
 Name:    kdenetwork
 Epoch:   7
 Version: 3.5.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: K Desktop Environment - Network Applications
 
 License: GPLv2
@@ -52,11 +52,12 @@
 %else
 Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 %endif
 
 Requires(preun):  chkconfig
-Requires(post):   /sbin/ldconfig chkconfig
-Requires(postun): /sbin/ldconfig
+Requires(post):   chkconfig
 
 BuildRequires: gettext
 BuildRequires: kdelibs3-devel >= %{version}
@@ -142,7 +143,7 @@
 # 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}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
 %endif
@@ -244,7 +245,7 @@
 
 
 %post
-/sbin/ldconfig
+%{!?libs:/sbin/ldconfig}
 /sbin/chkconfig --add lisa ||:
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
@@ -253,7 +254,7 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-/sbin/ldconfig
+%{!?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -434,7 +435,7 @@
 %{_datadir}/apps/*
 %{_datadir}/applications/kde/*
 %{_datadir}/applnk/.hidden/*
-%config(noreplace) %{_datadir}/config/*
+%{_datadir}/config/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/*
@@ -442,21 +443,27 @@
 %{_datadir}/servicetypes/*
 %{_datadir}/sounds/*
 
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/kde/*
-%{_libdir}/libkopete*.so
-%{_libdir}/librss.so
-
+%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
+%endif
 %{_libdir}/libkopete*.so.*
 %{_libdir}/libkopete*.la
 %{_libdir}/librss.so.*
 %{_libdir}/librss.la
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/kde/*
+%{_libdir}/libkopete*.so
+%{_libdir}/librss.so
+
 
 %changelog
+* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-4
+- libs: Requires: %%{name}... (multilib upgrades)
+- fixup scriptlets
+
 * Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-3
 - -libs: Obsoletes: %%name ... to help out multilib upgrades
 




More information about the fedora-extras-commits mailing list