[kdepimlibs] restore documentation multilib hack for now as per IRC discussion with tosky

Kevin Kofler kkofler at fedoraproject.org
Wed Feb 6 12:40:25 UTC 2013


commit 0ba4c2496706d7b43d9e8164d3547f4d57569885
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Wed Feb 6 13:40:14 2013 +0100

    restore documentation multilib hack for now as per IRC discussion with tosky
    
    * Wed Feb 06 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.10.0-2
    - restore documentation multilib hack for now as per IRC discussion with tosky
    
    User madalinux reported on IRC that we still get multilib conflicts, tosky
    confirmed that more fixing is needed.

 kdepimlibs.spec |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/kdepimlibs.spec b/kdepimlibs.spec
index cb0c545..7a69bf9 100644
--- a/kdepimlibs.spec
+++ b/kdepimlibs.spec
@@ -7,7 +7,7 @@
 Name: kdepimlibs
 Summary: KDE PIM Libraries
 Version: 4.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -122,6 +122,15 @@ kde4-doxygen.sh --doxdatadir=%{_kde4_docdir}/HTML/en/common .
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# hack around HTML doc multilib conflicts
+for doxy_hack in kcontrol/kresources ; do
+pushd %{buildroot}%{_kde4_docdir}/HTML/en/${doxy_hack}
+bunzip2 index.cache.bz2
+sed -i -e 's!<a name="id[a-z]*[0-9]*"></a>!!g' index.cache
+bzip2 -9 index.cache
+done
+popd
+
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
 pushd %{buildroot}%{_kde4_libdir}
@@ -275,6 +284,9 @@ update-mime-database %{_kde4_datadir}/mime >& /dev/null
 
 
 %changelog
+* Wed Feb 06 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.10.0-2
+- restore documentation multilib hack for now as per IRC discussion with tosky
+
 * Thu Jan 31 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.0-1
 - 4.10.0
 


More information about the scm-commits mailing list