[kde-workspace] - drop old patch for aurora - fix multilib issue
Than Ngo
than at fedoraproject.org
Mon Apr 29 17:41:47 UTC 2013
commit f2af0c8291a85804d60e6b28035def53323be1fe
Author: Than Ngo <than at redhat.com>
Date: Mon Apr 29 19:41:13 2013 +0200
- drop old patch for aurora
- fix multilib issue
kde-workspace.spec | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 0dbf672..5b30e09 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -17,7 +17,7 @@
Summary: KDE Workspace
Name: kde-workspace
Version: 4.10.2
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv2
URL: https://projects.kde.org/projects/kde/kde-workspace
@@ -49,9 +49,6 @@ Patch8: kdebase-workspace-4.2.85-klipper-url.patch
# 434824: KDE4 System Settings - No Method To Enter Administrative Mode
Patch9: kdebase-workspace-4.4.90-rootprivs.patch
-# no klipper action on selection for Arora browser
-Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
-
# kio_sysinfo based on OpenSUSE's patch
Patch15: kdebase-workspace-4.3.75-kio_sysinfo.patch
@@ -555,6 +552,14 @@ install -m644 -p %{SOURCE10} %{buildroot}%{_sysconfdir}/kde/env/
# unpackaged files
rm -rfv %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Default/
+# fix documentation multilib conflict in index.cache
+for f in kcontrol/colors kmenuedit kcontrol/windowbehaviour kcontrol/kwindecoration \
+ kcontrol/khotkeys kdm ksysguard ; do
+ bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache.bz2
+ sed -i -e 's!name="id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
+ sed -i -e 's!#id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
+ bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
+done
%check
for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -1036,6 +1041,10 @@ fi
%changelog
+* Mon Apr 29 2013 Than Ngo <than at redhat.com> - 4.10.2-11
+- drop old patch for aurora
+- fix multilib issue
+
* Mon Apr 29 2013 Martin Briza <mbriza at redhat.com> 4.10.2-10
- changed the systemd-displaymanager patch to switch the sessions using systemd-logind, too
More information about the scm-commits
mailing list