rpms/kdemultimedia/devel kdemultimedia.spec,1.92,1.93

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdemultimedia.spec 
Log Message:
* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-8
- -libs: Requires: %name (multilib upgrades again)
- scriptlet fixes



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- kdemultimedia.spec	27 Oct 2007 11:34:31 -0000	1.92
+++ kdemultimedia.spec	30 Oct 2007 15:24:45 -0000	1.93
@@ -26,7 +26,7 @@
 Summary: Multimedia applications for the K Desktop Environment (KDE)
 Epoch:   6
 Version: 3.5.8
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -57,10 +57,9 @@
 %else
 Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+%endif
 
 BuildRequires: zlib-devel
 BuildRequires: kdelibs3-devel >= %{version}
@@ -114,6 +113,8 @@
 %else
 Obsoletes: %{name}-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:  %{name}-extras-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 %endif
 %description extras
 %{summary}, including:
@@ -138,7 +139,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
@@ -254,7 +255,7 @@
 
 
 %post
-/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 ||:
@@ -262,7 +263,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 ||:
@@ -280,6 +281,7 @@
 %endif
 
 %post extras
+%{?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 ||:
@@ -287,6 +289,7 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun extras
+%{?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 ||:
@@ -422,6 +425,10 @@
 
 
 %changelog
+* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-8
+- -libs: Requires: %%name (multilib upgrades again)
+- scriptlet fixes
+
 * Sat Oct 27 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.8-7
 - fix typo in dependency