rpms/kdebase-runtime/F-9 .cvsignore, 1.17, 1.18 kdebase-runtime.spec, 1.63, 1.64
Rex Dieter
rdieter at fedoraproject.org
Thu Feb 12 15:54:43 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6739
Modified Files:
.cvsignore 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 8 Jan 2009 14:16:57 -0000 1.17
+++ .cvsignore 12 Feb 2009 15:54:13 -0000 1.18
@@ -1 +1 @@
-kdebase-runtime-4.1.4.tar.bz2
+kdebase-runtime-4.2.0.tar.bz2
Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdebase-runtime.spec 28 Jan 2009 12:52:31 -0000 1.63
+++ kdebase-runtime.spec 12 Feb 2009 15:54:13 -0000 1.64
@@ -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
More information about the fedora-extras-commits
mailing list