rpms/kdebase/devel kdebase.spec,1.291,1.292

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdebase.spec 
Log Message:
* Wed Jan 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.0-3
- resurrect -libs (f9+)
- improve %description



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- kdebase.spec	19 Jan 2008 19:12:35 -0000	1.291
+++ kdebase.spec	30 Jan 2008 20:12:23 -0000	1.292
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
 Version:       4.0.0
-Release:       2%{?dist}.1
+Release:       3%{?dist}
 
 %if 0%{?fedora} > 8
 Name:          kdebase
@@ -10,7 +10,10 @@
 Obsoletes:     kdebase4 < %{version}-%{release}
 Provides:      kdebase4 = %{version}-%{release}
 
-Obsoletes:     %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:     %{name}-extras < %{epoch}:%{version}-%{release}
+
+# make -libs subpkg
+%define libs 1
 
 %else
 Name:          kdebase4
@@ -24,15 +27,23 @@
 
 BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
-Requires: kdelibs4 >= %{version}
-Requires: kdepimlibs >= %{version}
-Requires: kdebase-runtime >= %{version}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 %ifnarch s390 s390x
 Requires: eject
 %endif
 
+%if 0%{?libs}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%else
+# are these 2 *really* needed? -- Rex
+Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
+Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
+Provides:  %{name}-libs = %{epoch}:%{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+%endif
+
 Provides:      dolphin = 0.9.5-1
 Obsoletes:     dolphin < 0.9.5-1
 Obsoletes:     d3lphin
@@ -83,20 +94,36 @@
 
 %description
 Core runtime requirements and applications for the K Desktop Environment 4.
+%if "%{name}" == "kdebase4"
 This package does not include the KDE 4 versions of applications which are
 provided by KDE 3 because of file and configuration setting conflicts.
+%endif
+
+%if 0%{?libs}
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+# helps multilib upgrades? -- Rex
+Obsoletes: kdebase < %{epoch}:%{version}-%{release}
+# are these 2 *really* needed? -- Rex
+Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
+# include to be paranoid, installing libs-only is untested -- Rex
+Requires: %{name} = %{epoch}:%{version}-%{release}
+%description libs
+%{summary}.
+%endif
 
 %package devel
 Group:    Development/Libraries
-Summary:  Header files for kdebase4
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary:  Development files for %{name} 
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 %if "%{name}" != "kdebase4"
 Obsoletes: kdebase4-devel < %{version}-%{release}
 Provides:  kdebase4-devel = %{version}-%{release}
 %endif
 Requires: kdelibs4-devel kdepimlibs4-devel
 %description devel
-Header files for developing applications using %{name}.
+%{summary}.
 
 
 %prep
@@ -222,7 +249,7 @@
 
 
 %post
-/sbin/ldconfig ||:
+%{!?libs:/sbin/ldconfig}
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %if "%{name}" == "kdebase"
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
@@ -230,13 +257,19 @@
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
-/sbin/ldconfig ||:
+%{!?libs:/sbin/ldconfig}
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %if "%{name}" == "kdebase"
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %endif
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
 
 %files
 %defattr(-,root,root,-)
@@ -249,7 +282,6 @@
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/*
-%{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
 %exclude %{_kde4_libdir}/kde4/devel/
 
@@ -262,6 +294,12 @@
 %{_kde4_libdir}/libkdeinit4_*.so
 %endif
 
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_kde4_libdir}/lib*.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
@@ -269,6 +307,10 @@
 
 
 %changelog
+* Wed Jan 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.0-3
+- resurrect -libs (f9+)
+- improve %%description
+
 * Sat Jan 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.0-2.1
 - Obsoletes: dolphin, d3lphin, Provides: dolphin everywhere