rpms/kdelibs/F-7 kdelibs.spec,1.230,1.231
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Wed Feb 27 08:36:33 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7969/F-7
Modified Files:
kdelibs.spec
Log Message:
Sync from devel:
* Sat Feb 16 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-2
- F9+: include %%{_docdir}/HTML/en/common files which are not in kdelibs-common
and bump to 3.5.9-3.
Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- kdelibs.spec 26 Feb 2008 14:12:23 -0000 1.230
+++ kdelibs.spec 27 Feb 2008 08:35:54 -0000 1.231
@@ -21,7 +21,7 @@
Summary: K Desktop Environment 3 - Libraries
Version: 3.5.9
-Release: 2%{?dist}
+Release: 3%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs3
@@ -378,7 +378,43 @@
rm -f %{buildroot}%{_datadir}/config/kdebug.areas
rm -f %{buildroot}%{_datadir}/config/kdebugrc
rm -f %{buildroot}%{_datadir}/config/ui/ui_standards.rc
-rm -rf %{buildroot}%{_datadir}/doc/HTML/en/common/
+rm -f %{buildroot}%{_docdir}/HTML/en/common/1.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/10.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/2.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/3.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/4.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/5.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/6.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/7.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/8.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/9.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/artistic-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/bottom-left.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/bottom-middle.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/bottom-right.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/bsd-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/doxygen.css
+rm -f %{buildroot}%{_docdir}/HTML/en/common/favicon.ico
+rm -f %{buildroot}%{_docdir}/HTML/en/common/fdl-license
+rm -f %{buildroot}%{_docdir}/HTML/en/common/fdl-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/fdl-notice.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/footer.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/gpl-license
+rm -f %{buildroot}%{_docdir}/HTML/en/common/gpl-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/header.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/kde-default.css
+rm -f %{buildroot}%{_docdir}/HTML/en/common/kde_logo_bg.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/lgpl-license
+rm -f %{buildroot}%{_docdir}/HTML/en/common/lgpl-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/mainfooter.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/mainheader.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/qpl-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/top-left.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/top-middle.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/top-right-konqueror.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/top-right.jpg
+rm -f %{buildroot}%{_docdir}/HTML/en/common/x11-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/xml.dcl
rm -rf %{buildroot}%{_datadir}/locale/all_languages
rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
rm -rf %{buildroot}%{_datadir}/autostart/
@@ -497,6 +533,8 @@
# include also the conflicting file in kdelibs fedora < 9
%{_docdir}/HTML/en/common
%{_datadir}/locale/all_languages
+%else
+%{_docdir}/HTML/en/common/*
%endif
%if 0%{?include_crystalsvg}
%{_datadir}/icons/crystalsvg/
@@ -531,10 +569,13 @@
%changelog
-* Tue Feb 26 2008 Lukáš Tinkl <ltinkl at redhat.com> - 3.5.9-2
+* Tue Feb 26 2008 Lukáš Tinkl <ltinkl at redhat.com> - 3.5.9-3
- #230979: Writes ServerBin into cupsd.conf
- #416101: unable to print after configuring printing in KDE
+* Sat Feb 16 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-2
+- F9+: include %%{_docdir}/HTML/en/common files which are not in kdelibs-common
+
* Thu Feb 14 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-1
- kde-3.5.9
More information about the fedora-extras-commits
mailing list