rpms/kdelibs4/F-8 kdelibs4.spec,1.22,1.23
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Thu Jul 24 22:12:00 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7851/F-8
Modified Files:
kdelibs4.spec
Log Message:
Sync from kdelibs/devel:
* Thu Jul 24 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-2
- move Sonnet documentation back to the main package
- fix #453063 (Sonnet documentation multilib conflict) properly
Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kdelibs4.spec 24 Jul 2008 18:16:50 -0000 1.22
+++ kdelibs4.spec 24 Jul 2008 22:11:10 -0000 1.23
@@ -2,7 +2,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.1.0
-Release: 1%{?dist}.1
+Release: 2%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@@ -266,6 +266,11 @@
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
+# fix Sonnet documentation multilib conflict
+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
+bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
+
# install apidocs and generator script
install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
%endif
@@ -312,6 +317,7 @@
%{_kde4_sharedir}/kde4/services/*
%{_kde4_sharedir}/kde4/servicetypes/*
%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
+%{_kde4_docdir}/HTML/en/sonnet/
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkdeinit4_*.so
%dir %{_kde4_libdir}/kde4/
@@ -338,7 +344,6 @@
%{_kde4_docdir}/HTML/en/common/
%{_kde4_datadir}/locale/all_languages/
%endif
-%{_kde4_docdir}/HTML/en/sonnet/
%files devel
%defattr(-,root,root,-)
@@ -361,8 +366,9 @@
%changelog
-* Thu Jul 24 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-1.1
-- fix file list for build as kdelibs4 (no -common split)
+* Thu Jul 24 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-2
+- move Sonnet documentation back to the main package
+- fix #453063 (Sonnet documentation multilib conflict) properly
* Wed Jul 23 2008 Than Ngo <than at redhat.com> 4.1.0-1
- 4.1.0
More information about the fedora-extras-commits
mailing list