redhat-menus and redhat-lsb fixes

["Razvan Corneliu C.R. \"d3vi1\" VILT" <razvan vilt linux360 ro>]

Since the version shift in redhat-menus gnome lost it's More submenus.
I'm pretty positive that most users will consider this a bug, so I
attached here a patch for redhat-menus.

Also I've attached one for redhat-lsb because it simply won't install
(anaconda overrides this) kill was moved from /usr/bin to /bin, and the
spec wasn't updated.

Otherwise cheers
-- 
Razvan Corneliu C.R. "d3vi1" VILT <razvan vilt linux360 ro>
Digital Vision - linux360 - Vision Project Maintainer

diff -Nru redhat-menus-1.3.old/menus/applications.menu redhat-menus-1.3/menus/applications.menu
--- redhat-menus-1.3.old/menus/applications.menu	2004-03-16 22:17:11.000000000 +0200
+++ redhat-menus-1.3/menus/applications.menu	2004-04-16 01:26:26.327195267 +0300
@@ -45,17 +45,32 @@
   </Exclude>
 
   <!-- Accessories submenu -->
+
   <Menu>
     <Name>Accessories</Name>
     <Directory>Accessories.directory</Directory>
     <Include>
       <And>
         <Category>Utility</Category>
+	<Category>X-Red-Hat-Base</Category>
         <Not>
           <Category>System</Category>
         </Not>
       </And>
     </Include>
+    <Menu>
+	<Name>MoreAccessories</Name>
+	<Directory>Accessories-More.directory</Directory>
+	<Include>
+        <And>
+    	    <Category>Utility</Category>
+    	    <Not>
+	        <Category>X-Red-Hat-Base</Category>
+    	        <Category>System</Category>
+    	    </Not>
+    	</And>
+	</Include>
+    </Menu> <!-- End MoreAccessories -->
   </Menu> <!-- End Accessories -->
 
   <!-- Development Tools -->
@@ -65,9 +80,22 @@
     <Include>
       <And>
         <Category>Development</Category>
+	<Category>X-Red-Hat-Base</Category>
       </And>
       <Filename>emacs.desktop</Filename>
     </Include>
+    <Menu>
+	<Name>MoreDevelopment</Name>
+	<Directory>Development-More.directory</Directory>
+	<Include>
+        <And>
+    	    <Category>Development</Category>
+	    <Not>
+		<Category>X-Red-Hat-Base</Category>
+	    </Not>
+        </And>
+	</Include>
+    </Menu> <!-- End MoreDevelopment Tools -->
   </Menu> <!-- End Development Tools -->
 
   <!-- Edutainment -->
@@ -77,10 +105,20 @@
     <Include>
       <And>
         <Category>Education</Category>
+<!--	<Category>X-Red-Hat-Base</Category> //We have no Edutainment-More and we don't need one as it's small-->
       </And>
     </Include>
+<!--    <Menu>
+	<Name>MoreEdutainment</Name>
+	<Directory>Edutainment-More.directory</Directory>
+	<Include>
+    	    <And>
+    		<Category>Education</Category>
+		<Not><Category>X-Red-Hat-Base</Category></Not>
+    	    </And>
+	</Include>
+    </Menu> <!-- End Edutainment --> -->
   </Menu> <!-- End Edutainment -->
-
   <!-- Games -->
   <Menu>
     <Name>Games</Name>
@@ -88,8 +126,19 @@
     <Include>
       <And>
         <Category>Game</Category>
+	<Category>X-Red-Hat-Base</Category>
       </And>
     </Include>
+    <Menu>
+	<Name>MoreGames</Name>
+	<Directory>Games-More.directory</Directory>
+	<Include>
+    	    <And>
+    		<Category>Game</Category>
+    		<Not><Category>X-Red-Hat-Base</Category></Not>
+    	    </And>
+	</Include>
+    </Menu> <!-- End MoreGames -->
   </Menu> <!-- End Games -->
 
   <!-- Graphics -->
@@ -99,10 +148,21 @@
     <Include>
       <And>
         <Category>Graphics</Category>
+	<Category>X-Red-Hat-Base</Category>
       </And>
       <Filename>dia.desktop</Filename>
       <Filename>drawing.desktop</Filename>
     </Include>
+    <Menu>
+	<Name>MoreGraphics</Name>
+	<Directory>Graphics-More.directory</Directory>
+	<Include>
+    	    <And>
+    		<Category>Graphics</Category>
+    		<Not><Category>X-Red-Hat-Base</Category></Not>
+    	    </And>
+	</Include>
+    </Menu> <!-- End MoreGraphics -->
   </Menu> <!-- End Graphics -->
 
   <!-- Internet -->
@@ -112,8 +172,19 @@
     <Include>
       <And>
         <Category>Network</Category>
+	<Category>X-Red-Hat-Base</Category>
       </And>
     </Include>
+    <Menu>
+	<Name>MoreInternet</Name>
+	<Directory>Internet-More.directory</Directory>
+	<Include>
+    	    <And>
+    		<Category>Network</Category>
+    		<Not><Category>X-Red-Hat-Base</Category></Not>
+    	    </And>
+	</Include>
+    </Menu>   <!-- End MoreInternet -->
   </Menu>   <!-- End Internet -->
 
   <!-- Multimedia -->
@@ -123,8 +194,19 @@
     <Include>
       <And>
         <Category>AudioVideo</Category>
+	<Category>X-Red-Hat-Base</Category>
       </And>
     </Include>
+    <Menu>
+	<Name>MoreMultimedia</Name>
+	<Directory>Multimedia-More.directory</Directory>
+	<Include>
+    	    <And>
+    		<Category>AudioVideo</Category>
+    		<Not><Category>X-Red-Hat-Base</Category></Not>
+    	    </And>
+	</Include>
+    </Menu>   <!-- End MoreMultimedia -->
   </Menu>   <!-- End Multimedia -->
 
   <!-- Office -->
@@ -134,8 +216,19 @@
     <Include>
       <And>
         <Category>Office</Category>
+	<Category>X-Red-Hat-Base</Category>
       </And>
     </Include>
+    <Menu>
+	<Name>MoreOffice</Name>
+	<Directory>Office-More.directory</Directory>
+	<Include>
+    	    <And>
+    		<Category>Office</Category>
+    		<Not><Category>X-Red-Hat-Base</Category></Not>
+    	    </And>
+	</Include>
+    </Menu> <!-- End MoreOffice -->
   </Menu> <!-- End Office -->
 
   <!-- System Tools-->
@@ -145,6 +238,7 @@
     <Include>
       <And>
         <Category>System</Category>
+	<Category>X-Red-Hat-Base</Category>
         <Not><Category>Screensaver</Category></Not>
         <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
         <Not><Category>SystemSetup</Category></Not>
@@ -171,6 +265,39 @@
       <Filename>redhat-switchmail.desktop</Filename>
       <Filename>redhat-switch-printer.desktop</Filename>
     </Exclude>
+    <Menu>
+	<Name>MoreSystem</Name>
+	<Directory>System-More.directory</Directory>
+	<Include>
+    	    <And>
+    		<Category>System</Category>
+		<Not><Category>X-Red-Hat-Base</Category></Not>
+    		<Not><Category>Screensaver</Category></Not>
+    		<Not><Category>X-Red-Hat-ServerConfig</Category></Not>
+    		<Not><Category>SystemSetup</Category></Not>
+	    </And>
+	</Include>
+	<Exclude>
+    	    <Filename>redhat-authconfig.desktop</Filename>
+    	    <Filename>system-config-date.desktop</Filename>
+    	    <Filename>system-config-keyboard.desktop</Filename>
+    	    <Filename>system-config-language.desktop</Filename>
+    	    <Filename>system-config-mouse.desktop</Filename>
+    	    <Filename>system-config-nfs.desktop</Filename>
+    	    <Filename>system-config-packages.desktop</Filename>
+    	    <Filename>system-config-rootpassword.desktop</Filename>
+    	    <Filename>system-config-securitylevel.desktop</Filename>
+    	    <Filename>system-config-services.desktop</Filename>
+    	    <Filename>system-config-soundcard.desktop</Filename>
+    	    <Filename>system-config-users.desktop</Filename>
+    	    <Filename>redhat-neat.desktop</Filename>
+    	    <Filename>redhat-printconf-gui.desktop</Filename>
+    	    <Filename>redhat-rhn-up2date-config.desktop</Filename>
+    	    <Filename>redhat-switchdesk.desktop</Filename>
+    	    <Filename>redhat-switchmail.desktop</Filename>
+    	    <Filename>redhat-switch-printer.desktop</Filename>
+	</Exclude>
+    </Menu>   <!-- End MoreSystem Tools -->
   </Menu>   <!-- End System Tools -->
 
   <!-- Other -->

diff -Nru redhat-lsb-1.3.old/redhat-lsb.spec redhat-lsb-1.3/redhat-lsb.spec
--- redhat-lsb-1.3.old/redhat-lsb.spec	2003-02-18 19:49:49.000000000 +0200
+++ redhat-lsb-1.3/redhat-lsb.spec	2004-04-16 01:28:53.143050428 +0300
@@ -151,7 +151,7 @@
 Requires: /usr/bin/ipcrm
 Requires: /usr/bin/ipcs
 Requires: /usr/bin/join
-Requires: /usr/bin/kill
+Requires: /bin/kill
 Requires: /usr/bin/killall
 Requires: /usr/bin/locale
 Requires: /usr/bin/localedef