[kde-baseapps] fix multilib issue

Than Ngo than at fedoraproject.org
Mon Apr 29 17:23:08 UTC 2013


commit f9ffcfd6d4d652205c23b68dbbcdb6b7b1ed547c
Author: Than Ngo <than at redhat.com>
Date:   Mon Apr 29 19:22:50 2013 +0200

    fix multilib issue

 kde-baseapps.spec |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index e469189..57a0105 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -1,7 +1,7 @@
 Name:    kde-baseapps
 Summary: KDE Core Applications 
 Version: 4.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-baseapps 
@@ -165,6 +165,14 @@ do
 done
 popd
 
+# fix documentation multilib conflict in index.cache
+for f in konqueror dolphin ; 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
+
 %find_lang %{name} --all-name --with-kde --without-mo
 
 
@@ -273,6 +281,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