SPECS: kde4-kdelibs.spec - R: xdg-menus - removed Conflicts - don't package...

[shadzik]

Author: shadzik                      Date: Fri Jul 18 21:35:27 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- R: xdg-menus
- removed Conflicts
- don't package own menu file

---- Files affected:
SPECS:
   kde4-kdelibs.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdelibs.spec
diff -u SPECS/kde4-kdelibs.spec:1.100 SPECS/kde4-kdelibs.spec:1.101
--- SPECS/kde4-kdelibs.spec:1.100	Fri Jul 18 13:17:21 2008
+++ SPECS/kde4-kdelibs.spec	Fri Jul 18 23:35:22 2008
@@ -16,7 +16,7 @@
 Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
 Name:		kde4-kdelibs
 Version:	4.0.98
-Release:	2
+Release:	3
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
@@ -97,15 +97,13 @@
 Requires:	hicolor-icon-theme
 Requires:	kde-common-dirs
 Requires:	setup >= 2.4.6-7
+Requires:	xdg-menus
 Requires:	xorg-app-iceauth
 Provides:	%{name}-shared
 Obsoletes:	kde4-kdelibs-shared
 Obsoletes:	kdelibs4
 Conflicts:	kdelibs < 9:3.5.8-11
 Conflicts:	kdelibs4
-Conflicts:	gnome-menus
-Conflicts:	applnk
-Conflicts:	kdelibs-shared
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_defaultdocdir	%{_prefix}/share/doc
@@ -310,8 +308,8 @@
 # from kde4-kdebase.spec - old common subpackage
 %dir %{_desktopdir}/kde4
 %dir %{_sysconfdir}/xdg/menus
-#
-%{_sysconfdir}/xdg/menus/applications.menu
+# DO NOT PACKAGE THIS FILE vvvv - use applnk
+#%{_sysconfdir}/xdg/menus/applications.menu
 %ghost /etc/security/fileshare.conf
 %attr(755,root,root) %{_bindir}/kjs
 %attr(755,root,root) %{_bindir}/kbuildsycoca4
@@ -1007,6 +1005,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2008/07/18 21:35:22  shadzik
+- R: xdg-menus
+- removed Conflicts
+- don't package own menu file
+
 Revision 1.100  2008/07/18 11:17:21  arekm
 - explict conflicts
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdelibs.spec?r1=1.100&r2=1.101&f=u