rpms/kdebase-runtime/devel kdebase-runtime.spec,1.69,1.70

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15998

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem
- grow -libs, kde4 styles are unavailable for i386 applications (#456826)



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kdebase-runtime.spec	26 Sep 2008 19:40:01 -0000	1.69
+++ kdebase-runtime.spec	29 Sep 2008 14:50:54 -0000	1.70
@@ -1,4 +1,4 @@
-%define _default_patch_fuzz 2
+define _default_patch_fuzz 2
 
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
@@ -10,7 +10,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -30,14 +30,15 @@
 %define rest 1
 %endif
 
+Requires: %{name}-libs = %{version}-%{release}
+
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 Provides:  kdebase4-runtime = %{version}-%{release}
 
 BuildRequires: kde-filesystem
 %{?_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(post): xdg-utils
+Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 %ifnarch s390 s390x
 Requires: eject
@@ -74,6 +75,14 @@
 provided by KDE 3 because of file and configuration setting conflicts.
 %endif
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: kdelibs4 >= %{version}
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 %package -n oxygen-icon-theme
 Summary: Oxygen icon theme
 Group: User Interface/Desktops
@@ -246,17 +255,19 @@
 
 
 %post
-/sbin/ldconfig ||:
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
-/sbin/ldconfig ||:
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %if 0%{?icons}
 %post -n oxygen-icon-theme
 xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
@@ -289,14 +300,16 @@
 %{_kde4_datadir}/sounds/*
 %{_kde4_libdir}/kconf_update_bin/*
 %{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_libdir}/libkaudiodevicelist.so.*
-%{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/phonon_platform/
+%{_kde4_libdir}/kde4/kcm_*.so
+%{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libexecdir}/*
-%{_kde4_libdir}/kde4/plugins/styles/
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
 
+%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so
+%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
+%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
+
 %if ! 0%{?kde3_desktop}
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_docdir}/HTML/en/*
@@ -312,10 +325,15 @@
 %{_datadir}/services/khelpcenter.desktop
 %endif
 
-%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so
-%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkaudiodevicelist.so.*
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/plugins/phonon_platform/
+%{_kde4_libdir}/kde4/plugins/styles/
+%exclude %{_kde4_libdir}/kde4/kcm_*.so
+%exclude %{_kde4_libdir}/kde4/kded_*.so
 %exclude %{_kde4_libdir}/kde4/phonon_xine.so
-%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
 
 %files -n phonon-backend-xine
 %defattr(-,root,root,-)
@@ -340,6 +358,11 @@
 
 
 %changelog
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+- grow -libs, kde4 styles are unavailable for i386 applications (#456826)
+
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org. 4.1.2-1
 - 4.1.2