SPECS: kde4-kdelibs.spec - adapter

[shadzik]

Author: shadzik                      Date: Fri Jun 20 20:00:12 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapter

---- Files affected:
SPECS:
   kde4-kdelibs.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdelibs.spec
diff -u SPECS/kde4-kdelibs.spec:1.82 SPECS/kde4-kdelibs.spec:1.83
--- SPECS/kde4-kdelibs.spec:1.82	Fri Jun 20 20:11:30 2008
+++ SPECS/kde4-kdelibs.spec	Fri Jun 20 22:00:07 2008
@@ -81,8 +81,8 @@
 BuildRequires:	pkgconfig
 BuildRequires:	qt4-build >= 4.4.0
 %{?with_apidocs:BuildRequires:	qt4-doc >= 4.4.0}
-BuildRequires:	qt4-qmake >= 4.4.0
 BuildRequires:	qt4-phonon-devel >= 4.4.0
+BuildRequires:	qt4-qmake >= 4.4.0
 BuildRequires:	rpmbuild(macros) >= 1.293
 BuildRequires:	shared-mime-info >= 0.18
 BuildRequires:	soprano-devel >= 2.0.98
@@ -99,11 +99,11 @@
 Requires:	kde-common-dirs
 Requires:	setup >= 2.4.6-7
 Requires:	xorg-app-iceauth
+Provides:	%{name}-shared
+Obsoletes:	kde4-kdelibs-shared
 Obsoletes:	kdelibs4
 Conflicts:	kdelibs < 9:3.5.8-11
 Conflicts:	kdelibs4
-Provides:	%{name}-shared
-Obsoletes:	%{name}-shared
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_defaultdocdir	%{_prefix}/share/doc
@@ -309,9 +309,9 @@
 %dir %{_kdedocdir}/en
 # from kde4-kdebase.spec - old common subpackage
 %dir %{_desktopdir}/kde4
-%dir /etc/xdg/menus
+%dir %{_sysconfdir}/xdg/menus
 #
-/etc/xdg/menus/applications.menu
+%{_sysconfdir}/xdg/menus/applications.menu
 %ghost /etc/security/fileshare.conf
 %attr(755,root,root) %{_bindir}/kjs
 %attr(755,root,root) %{_bindir}/kbuildsycoca4
@@ -512,6 +512,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2008/06/20 20:00:07  shadzik
+- adapter
+
 Revision 1.82  2008/06/20 18:11:30  shadzik
 - add /etc/xdg/menus/applications.menu (prevents installing of applnk or gnome-menus or kde3)
 - rel 4
================================================================

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