rpms/redhat-menus/devel redhat-menus-no-package-install.patch, 1.1, 1.2 redhat-menus.spec, 1.48, 1.49

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	redhat-menus-no-package-install.patch redhat-menus.spec 
Log Message:
Hide the separator as well


redhat-menus-no-package-install.patch:
 applications.menu |    7 -------
 1 files changed, 7 deletions(-)

Index: redhat-menus-no-package-install.patch
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus-no-package-install.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redhat-menus-no-package-install.patch	2 Dec 2005 22:11:14 -0000	1.1
+++ redhat-menus-no-package-install.patch	7 Dec 2005 15:01:56 -0000	1.2
@@ -1,6 +1,16 @@
---- redhat-menus-5.0.7/menus/applications.menu.noscp	2005-12-02 17:08:44.000000000 -0500
-+++ redhat-menus-5.0.7/menus/applications.menu	2005-12-02 17:08:49.000000000 -0500
-@@ -172,10 +172,6 @@
+--- redhat-menus-5.0.7/menus/applications.menu.no-package-install	2005-11-21 16:29:48.000000000 -0500
++++ redhat-menus-5.0.7/menus/applications.menu	2005-12-07 10:00:25.000000000 -0500
+@@ -17,9 +17,6 @@
+   <!-- Read in overrides and child menus from applications.d -->
+   <DefaultMergeDirs/>
+ 
+-  <!-- Add a separator after the submenus -->
+-  <Layout><Merge type="menus"/><Separator/><Merge type="files"/></Layout>
+-
+   <!-- Accessories submenu -->
+   <Menu>
+     <Name>Accessories</Name>
+@@ -172,10 +169,6 @@
      </Include>
    </Menu> <!-- End Other -->
  	


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- redhat-menus.spec	2 Dec 2005 22:11:14 -0000	1.48
+++ redhat-menus.spec	7 Dec 2005 15:02:00 -0000	1.49
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 5.0.7
-Release: 2
+Release: 3
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Patch0: redhat-menus-no-package-install.patch
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .no-package-install
 
 %build
 
@@ -67,6 +67,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Wed Dec  7 2005 Matthias Clasen <mclasen at redhat.com> - 5.0.7-3
+- hide the separator as well
+
 * Fri Dec  2 2005 Jeremy Katz <katzj at redhat.com> - 5.0.7-2
 - hide system-config-packages from the applications menu until it works again