rpms/kde-filesystem/F-8 kde-filesystem.spec,1.14,1.15

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kde-filesystem/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30257/F-8

Modified Files:
	kde-filesystem.spec 
Log Message:
Sync from devel:

* Mon Jul 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4-17
- + %%_kde4_sharedir/kde4

* Sun Jun 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4-16
- + %%_datadir/apps/konqueror(/servicemenus)

* Fri May 16 2008 Rex Dieter <rdieter at fedoraproject.org> 4-15
- omit %%_sysconfdir/kde/xdg (see also #249109)


Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-8/kde-filesystem.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kde-filesystem.spec	16 Apr 2008 13:23:52 -0000	1.14
+++ kde-filesystem.spec	24 Jul 2008 21:27:51 -0000	1.15
@@ -17,7 +17,7 @@
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 14%{?dist}
+Release: 17%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -56,8 +56,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 ## KDE3 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm,xdg/menus}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,emoticons,mimelnk,services,servicetypes,sounds,templates,source,wallpapers}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus
 # not sure who best should own locolor, so we'll included it here, for now. -- Rex
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/{16x16,22x22,32x32,48x48}/{actions,apps,mimetypes}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/{.hidden,Applications,Edutainment,Graphics,Internet,Settings,System,Toys,Utilities}
@@ -77,7 +78,6 @@
       -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/env \
       -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/shutdown \
       -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/kdm \
-      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/xdg/menus \
       -p $RPM_BUILD_ROOT%{_kde4_includedir} \
       -p $RPM_BUILD_ROOT%{_kde4_libexecdir} \
       -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
@@ -87,8 +87,8 @@
       -p $RPM_BUILD_ROOT%{_kde4_configdir} \
       -p $RPM_BUILD_ROOT%{_kde4_sharedir}/config.kcfg \
       -p $RPM_BUILD_ROOT%{_kde4_sharedir}/emoticons \
-      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/services \
-      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/servicetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/services \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/servicetypes \
       -p $RPM_BUILD_ROOT%{_kde4_datadir}/sounds \
       -p $RPM_BUILD_ROOT%{_kde4_sharedir}/templates/.source \
       -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers \
@@ -170,8 +170,7 @@
 %{_kde4_sharedir}/emoticons/
 %{_kde4_datadir}/autostart/
 %{_kde4_datadir}/icons/locolor
-%{_kde4_sharedir}/services/
-%{_kde4_sharedir}/servicetypes/
+%{_kde4_sharedir}/kde4/
 %{_kde4_sharedir}/templates/
 %{_kde4_datadir}/wallpapers/
 %{_kde4_datadir}/sounds/
@@ -180,6 +179,15 @@
 
 
 %changelog
+* Mon Jul 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4-17
+- + %%_kde4_sharedir/kde4
+
+* Sun Jun 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4-16
+- + %%_datadir/apps/konqueror(/servicemenus)
+
+* Fri May 16 2008 Rex Dieter <rdieter at fedoraproject.org> 4-15
+- omit %%_sysconfdir/kde/xdg (see also #249109)
+
 * Thu Apr 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4-14
 - don't define %%{_kde4_debug} in macros.kde4 anymore