[kde-runtime] fix multilib issue
Than Ngo
than at fedoraproject.org
Mon Apr 29 15:39:19 UTC 2013
commit a91616aa59315817a20af47dc28ed3f3b19cfe7e
Author: Than Ngo <than at redhat.com>
Date: Mon Apr 29 17:38:47 2013 +0200
fix multilib issue
kde-runtime.spec | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/kde-runtime.spec b/kde-runtime.spec
index cc8241e..9dc8fad 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -6,7 +6,7 @@
Name: kde-runtime
Summary: KDE Runtime
Version: 4.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
# http://techbase.kde.org/Policies/Licensing_Policy
License: LGPLv2+ and GPLv2+
@@ -209,6 +209,15 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+# fix documentation multilib conflict in index.cache
+for f in kioslave/nepomuksearch kcontrol/spellchecking kcontrol/performance \
+ kcontrol/kcmnotify kcontrol/kcmcss kcontrol/ebrowsing; 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
+
# kdesu symlink
ln -s %{_kde4_libexecdir}/kdesu %{buildroot}%{_kde4_bindir}/kdesu
@@ -236,6 +245,9 @@ rm -vf %{buildroot}%{_kde4_libdir}/lib{kwalletbackend,molletnetwork}.so
chrpath --list %{buildroot}%{_libdir}/kde4/plugins/phonon_platform/kde.so ||:
chrpath --delete %{buildroot}%{_libdir}/kde4/plugins/phonon_platform/kde.so
+%if 0%{?rhel}
+ rm -f %{_kde4_datadir}/kde4/services/searchproviders/fedora.desktop
+%endif
%check
for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -245,7 +257,7 @@ done
%post
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%if 0%{?fedora} > 16
+%if 0%{?fedora} > 16 || 0%{?rhel} > 6
# make DrKonqi work by default by taming SELinux enough (suggested by dwalsh)
# if KDE_DEBUG is set, DrKonqi is disabled, so do nothing
# if it is unset (or empty), check if deny_ptrace is already disabled
@@ -390,6 +402,9 @@ fi
%changelog
+* Mon Apr 29 2013 Than Ngo <than at redhat.com> - 4.10.2-2
+- fix multilib issue
+
* Sun Mar 31 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.2-1
- 4.10.2
More information about the scm-commits
mailing list