rpms/redhat-menus/devel redhat-menus.spec,1.83,1.84

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/redhat-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24320

Modified Files:
	redhat-menus.spec 
Log Message:
- create /etx/xdg/menus/settings-merged by default



Index: redhat-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- redhat-menus.spec	3 Jul 2007 02:48:28 -0000	1.83
+++ redhat-menus.spec	6 Sep 2007 17:30:54 -0000	1.84
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 8.9.10
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 # add the preferences.menu file from upstream, which
@@ -61,6 +61,10 @@
 # this is in gnome-menus now
 rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/System.directory
 
+# create the settings-merged to prevent gamin from looking for it
+# in a loop
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/settings-merged ||:
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -75,11 +79,15 @@
 %dir %{_sysconfdir}/xdg/menus/applications-merged
 %dir %{_sysconfdir}/xdg/menus/preferences-merged
 %dir %{_sysconfdir}/xdg/menus/preferences-post-merged
+%dir %{_sysconfdir}/xdg/menus/settings-merged
 %config %{_sysconfdir}/xdg/menus/*.menu
 %{_datadir}/desktop-menu-patches/*.desktop
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Thu Sep  6 2007 Ray Strode <rstrode at redhat.com> - 8.9.10-9
+- create /etx/xdg/menus/settings-merged by default
+
 * Wed Jul  2 2007 Matthias Clasen <mclasen at redhat.com> - 8.9.10-8
 - More category finetuning