SPECS: kdelibs4.spec - no arts, applnk conflict resolved, missing ...

[pascalek]

Author: pascalek                     Date: Mon Jan 14 10:21:48 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no arts, applnk conflict resolved, missing /usr/share/doc/kde

---- Files affected:
SPECS:
   kdelibs4.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/kdelibs4.spec
diff -u SPECS/kdelibs4.spec:1.10 SPECS/kdelibs4.spec:1.11
--- SPECS/kdelibs4.spec:1.10	Sun Jan 13 15:32:14 2008
+++ SPECS/kdelibs4.spec	Mon Jan 14 11:21:43 2008
@@ -105,7 +105,6 @@
 BuildConflicts:	kdepim-libkdepim < 3:3.3.0
 %endif
 Requires:	QtCore >= 4.2.0
-Requires:	arts >= %{artsver}
 Requires:	docbook-dtd412-xml
 Requires:	docbook-dtd42-xml
 Requires:	docbook-style-xsl
@@ -337,6 +336,7 @@
 
 %files
 %defattr(644,root,root,755)
+%dir %{_docdir}/kde
 %dir %{_kdedocdir}
 %dir %{_kdedocdir}/en
 %lang(en) %{_kdedocdir}/en/common
@@ -424,7 +424,8 @@
 %{_datadir}/kde4/servicetypes
 %{_datadir}/kde4/services
 
-%{_sysconfdir}/xdg/menus/applications.menu
+# conflicts with applnk
+#%{_sysconfdir}/xdg/menus/applications.menu
 
 %dir %{_datadir}/dbus-1/interfaces
 %{_datadir}/dbus-1/interfaces/*.xml
@@ -529,6 +530,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2008-01-14 10:21:43  pascalek
+- no arts, applnk conflict resolved, missing /usr/share/doc/kde
+
 Revision 1.10  2008-01-13 14:32:14  glen
 - correct changelog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdelibs4.spec?r1=1.10&r2=1.11&f=u