rpms/kdebase-runtime/F-10 kdebase-runtime.spec,1.81,1.82

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6611

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Thu Feb 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-6
- -libs: include %{_kde4_libdir}/libkwalletbackend.so.* here



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- kdebase-runtime.spec	26 Jan 2009 21:51:16 -0000	1.81
+++ kdebase-runtime.spec	12 Feb 2009 15:53:30 -0000	1.82
@@ -6,7 +6,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.0
-Release:       3%{?dist}
+Release:       6%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -34,7 +34,7 @@
 # when kdesu was removed, this is/should-be only temporary
 Conflicts: kdebase3 < 3.5.10-4
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 Provides:  kdebase4-runtime = %{version}-%{release}
@@ -238,9 +238,7 @@
 %endif
 
 # FIXME: -devel type files, omit for now
-rm -rf %{buildroot}%{_kde4_includedir}/phonon/
-rm -f  %{buildroot}%{_kde4_libdir}/libkaudiodevicelist.so
-rm -f  %{buildroot}%{_kde4_libdir}/libkwalletbackend.so
+rm -vf  %{buildroot}%{_kde4_libdir}/libkwalletbackend.so
 
 %endif
 
@@ -297,7 +295,6 @@
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %{_kde4_libdir}/kde4/kded_*.so
-%{_kde4_libdir}/libkwalletbackend.so.*
 %{_kde4_libexecdir}/*
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
@@ -312,17 +309,17 @@
 %{_kde4_datadir}/desktop-directories/*.directory
 %{_kde4_datadir}/emoticons/kde4/
 %{_kde4_datadir}/locale/en_US/entry.desktop
-%{_kde4_datadir}/locale/l10n/*.desktop
-%{_kde4_datadir}/locale/l10n/*/entry.desktop
+%{_kde4_datadir}/locale/l10n/
 %{_datadir}/services/khelpcenter.desktop
 %endif
 
 %files libs
 %defattr(-,root,root,-)
+%{_kde4_libdir}/libkwalletbackend.so.*
+# FIXME: move some of these to main pkg, e.g. kcm*.so, kded_*.so
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/kde4/plugins/phonon_platform/
 %{_kde4_libdir}/kde4/plugins/styles/
-
 %endif
 
 %if 0%{?icons}
@@ -339,6 +336,15 @@
 
 
 %changelog
+* Thu Feb 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-6
+- -libs: include %%{_kde4_libdir}/libkwalletbackend.so.* here
+
+* Thu Feb 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-5
+- Req: %%{name}-libs%%{?_isa} for multilib sanity (#456926)
+
+* Mon Feb 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
+- own %%_kde4_datadir/locale/l10n/
+
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
 - respun tarball