Merge branch 'f18' into f17
This commit is contained in:
commit
a3e8073d45
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.9.2
|
Version: 4.9.2
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -406,7 +406,7 @@ popd
|
|||||||
|
|
||||||
# fix Sonnet documentation multilib conflict
|
# fix Sonnet documentation multilib conflict
|
||||||
bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2
|
bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2
|
||||||
sed -i -e 's!<a name="id[0-9]*"></a>!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
|
sed -i -e 's!<a name="id[a-z]*[0-9]*"></a>!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
|
||||||
bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
|
bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
|
||||||
|
|
||||||
# install apidocs and generator script
|
# install apidocs and generator script
|
||||||
@ -579,6 +579,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 04 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.2-5
|
||||||
|
- multilib conflict /usr/share/doc/HTML/en/sonnet/index.cache.bz2 (#862388)
|
||||||
|
|
||||||
* Thu Oct 04 2012 Than Ngo <than@redhat.com> - 6:4.9.2-4
|
* Thu Oct 04 2012 Than Ngo <than@redhat.com> - 6:4.9.2-4
|
||||||
- revert kde#108510, kde#183534
|
- revert kde#108510, kde#183534
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user