From 7595b4761c0a668c625a34f113e3aa36cfa83567 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 4 Oct 2012 11:00:50 -0500 Subject: [PATCH] multilib conflict /usr/share/doc/HTML/en/sonnet/index.cache.bz2 (#862388) --- kdelibs.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kdelibs.spec b/kdelibs.spec index c6da42e..7145580 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -25,7 +25,7 @@ Summary: KDE Libraries Version: 4.9.2 -Release: 4%{?dist} +Release: 5%{?dist} Name: kdelibs Epoch: 6 @@ -406,7 +406,7 @@ popd # fix Sonnet documentation multilib conflict bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2 -sed -i -e 's!!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache +sed -i -e 's!!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache # install apidocs and generator script @@ -579,6 +579,9 @@ rm -rf %{buildroot} %changelog +* Thu Oct 04 2012 Rex Dieter 6:4.9.2-5 +- multilib conflict /usr/share/doc/HTML/en/sonnet/index.cache.bz2 (#862388) + * Thu Oct 04 2012 Than Ngo - 6:4.9.2-4 - revert kde#108510, kde#183534