rpms/redhat-menus/devel redhat-menus.spec, 1.41, 1.42 redhat-menus-5.0.0-move-prefs-out-of-apps-menu.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/redhat-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9791

Modified Files:
	redhat-menus.spec 
Removed Files:
	redhat-menus-5.0.0-move-prefs-out-of-apps-menu.patch 
Log Message:
- don't use dir name preferences-merged.  It has special
  significance (bug 169108)



Index: redhat-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- redhat-menus.spec	26 Sep 2005 19:33:52 -0000	1.41
+++ redhat-menus.spec	27 Sep 2005 15:12:50 -0000	1.42
@@ -3,8 +3,8 @@
 
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
-Version: 5.0.0
-Release: 2
+Version: 5.0.1
+Release: 1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
@@ -15,8 +15,6 @@
 BuildArch: noarch
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 
-Patch0: redhat-menus-5.0.0-move-prefs-out-of-apps-menu.patch
-
 ## old nautilus contained start-here stuff
 Conflicts: nautilus <= 2.0.3-1
 ## desktop files in redhat-menus point to icons in new artwork
@@ -30,7 +28,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .move-prefs-out-of-apps-menu
 
 %build
 
@@ -59,12 +56,17 @@
 %dir %{_sysconfdir}/xdg/menus
 %dir %{_sysconfdir}/xdg/menus/applications-merged
 %dir %{_sysconfdir}/xdg/menus/preferences-merged
+%dir %{_sysconfdir}/xdg/menus/preferences-post-merged
 %config %{_sysconfdir}/xdg/menus/*.menu
 %{_sysconfdir}/X11/starthere
 %{_datadir}/desktop-menu-patches/*.desktop
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Tue Sep 27 2005 Ray Strode <rstrode at redhat.com> 5.0.1-1
+- don't use dir name preferences-merged.  It has special
+  significance (bug 169108)
+
 * Mon Sep 26 2005 Ray Strode <rstrode at redhat.com> 5.0.0-2
 - one commented out patch was actually important and 
   shouldn't have been removed.


--- redhat-menus-5.0.0-move-prefs-out-of-apps-menu.patch DELETED ---