rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.50,1.51

Rex Dieter rdieter at fedoraproject.org
Mon Aug 3 13:15:12 UTC 2009


Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13423

Modified Files:
	kdeplasma-addons.spec 
Log Message:
* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
- -libs subpkg to sanitize multilib



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- kdeplasma-addons.spec	3 Aug 2009 01:04:32 -0000	1.50
+++ kdeplasma-addons.spec	3 Aug 2009 13:15:11 -0000	1.51
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -35,6 +35,11 @@ BuildRequires:  libXcomposite-devel libX
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+# when -libs was introduced
+Obsoletes: kdeplasma-addons < 4.3.0-3
+
 # most of former kdeaddons for KDE3 is now here
 Obsoletes: kdeaddons < 4
 # extragear-plasma -> kdeplasmoids rename
@@ -50,14 +55,19 @@ Provides: kde-plasma-lancelot = %{versio
 Obsoletes: kde-plasma-weather < 1.0.0-100
 Provides: kde-plasma-weather = 1.0.0-100
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 %description
 Additional plasmoids for KDE.
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}
@@ -96,19 +106,21 @@ rm -f  %{buildroot}%{_kde4_appsdir}/cmak
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %clean
 rm -rf %{buildroot}
@@ -133,6 +145,11 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/mime/packages/lancelotpart-mime.xml
 %{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_kde4_libdir}/kde4/*.so
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
+
+%files libs
+%defattr(-,root,root,-)
 %{_kde4_libdir}/libconversion.so.*
 %{_kde4_libdir}/libocsclient.so.*
 %{_kde4_libdir}/liblancelot.so.*
@@ -140,11 +157,12 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libplasmacomicprovidercore.so.*
 %{_kde4_libdir}/libplasmaweather.so.*
 %{_kde4_libdir}/librtm.so.*
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
 
 
 %changelog
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- -libs subpkg to sanitize multilib
+
 * Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - fix to allow updating of status via microblog plasmoid 
 




More information about the fedora-extras-commits mailing list