rpms/kdesdk/devel kdesdk.spec,1.73,1.74

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Oct 25 20:09:27 UTC 2007


Author: rdieter

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

Modified Files:
	kdesdk.spec 
Log Message:
* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-2
- -libs: Obsoletes: %name ... to help out multilib upgrades
- -libs conditional (f8+)



Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kdesdk.spec	15 Oct 2007 00:41:12 -0000	1.73
+++ kdesdk.spec	25 Oct 2007 20:08:52 -0000	1.74
@@ -3,10 +3,15 @@
 
 %define make_cvs 1 
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 Name:    kdesdk
 Summary: The KDE Software Development Kit (SDK)
 Version: 3.5.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -19,7 +24,13 @@
 
 Provides: kdesdk3 = %{version}-%{release}
 
-Requires: %{name}-libs = %{version}-%{release}
+%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(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -69,14 +80,18 @@
 %description devel
 %{summary}.
 
+%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} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
+%endif
 
 
 %prep
@@ -138,6 +153,7 @@
 fi
 
 %post
+%{!?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 ||:
@@ -145,15 +161,18 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
+%{!?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 ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
+%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
+%endif
 
 
 %files
@@ -173,6 +192,13 @@
 %{_libdir}/libkdeinit_*.so
 %{_mandir}/man1/*
 
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*
@@ -180,13 +206,12 @@
 %exclude %{_libdir}/libkdeinit_*.so
 %{_libdir}/libktrace_s.a
 
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-
 
 %changelog
+* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-2
+- -libs: Obsoletes: %%name ... to help out multilib upgrades
+- -libs conditional (f8+)
+
 * Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-1
 - kde-3.5.8
 - libs subpkg (more multilib friendly)




More information about the fedora-extras-commits mailing list