rpms/lxmenu-data/devel lxmenu-data-0.1.1-menu.patch, 1.1, 1.2 lxmenu-data.spec, 1.3, 1.4

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxmenu-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4045

Modified Files:
	lxmenu-data-0.1.1-menu.patch lxmenu-data.spec 
Log Message:
* Sun Dec 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-3
- Move Accessibility to Utilities


lxmenu-data-0.1.1-menu.patch:
 lxde-applications.menu |   55 +++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

Index: lxmenu-data-0.1.1-menu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxmenu-data/devel/lxmenu-data-0.1.1-menu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxmenu-data-0.1.1-menu.patch	5 Jul 2009 23:51:55 -0000	1.1
+++ lxmenu-data-0.1.1-menu.patch	5 Dec 2009 23:27:23 -0000	1.2
@@ -1,6 +1,35 @@
 --- lxmenu-data-0.1.1.orig/layout/lxde-applications.menu	2009-05-19 18:52:11.000000000 +0200
-+++ lxmenu-data-0.1.1/layout/lxde-applications.menu	2009-07-06 01:40:17.000000000 +0200
-@@ -148,29 +148,43 @@
++++ lxmenu-data-0.1.1/layout/lxde-applications.menu	2009-12-05 23:24:09.000000000 +0100
+@@ -20,28 +20,11 @@
+ 		<Include>
+ 			<And>
+ 				<Category>Utility</Category>
+-	<!-- Accessibility spec must have either the Utility or Settings
+-			 category, and we display an accessibility submenu already for
+-			 the ones that do not have Settings, so don't display accessibility
+-			 applications here -->
+-				<Not><Category>Accessibility</Category></Not>
+ 				<Not><Category>System</Category></Not>
+ 			</And>
+ 		</Include>
+ 	</Menu> <!-- End Accessories -->
+ 
+-	<!-- Accessibility submenu -->
+-	<Menu>
+-		<Name>Universal Access</Name>
+-		<Directory>lxde-utility-accessibility.directory</Directory>
+-		<Include>
+-			<And>
+-				<Category>Accessibility</Category>
+-				<Not><Category>Settings</Category></Not>
+-			</And>
+-		</Include>
+-	</Menu> <!-- End Accessibility -->
+-
+ 	<!-- Development Tools -->
+ 	<Menu>
+ 		<Name>Development</Name>
+@@ -148,29 +131,43 @@
  		</Include>
  		</Menu> <!-- End Other -->
  
@@ -13,10 +42,7 @@
  		<Include>
 -			<Or>
 +			<And>
- 				<Category>Settings</Category>
--				<Category>PackageManager</Category>
--				<Category>System</Category>
--			</Or>
++				<Category>Settings</Category>
 +				<Not>
 +					<Or>
 +						<Category>System</Category>
@@ -26,24 +52,27 @@
 +					</Or>
 +				</Not>
 +			</And>
- 		</Include>
--		<Layout>
--			<Merge type="menus"/>
--			<Merge type="files"/>
--		</Layout>
++		</Include>
 +	</Menu>		<!-- End Preferences -->
- 
--	</Menu> <!-- End Settings -->
++
 +	<!-- System Settings -->
 +	<Menu>
 +		<Name>Administration</Name>
 +		<Directory>lxde-settings-system.directory</Directory>
 +		<Include>
 +			<And>
-+				<Category>Settings</Category>
-+				<Category>System</Category>
+ 				<Category>Settings</Category>
+-				<Category>PackageManager</Category>
+ 				<Category>System</Category>
+-			</Or>
 +			</And>
-+		</Include>
+ 		</Include>
+-		<Layout>
+-			<Merge type="menus"/>
+-			<Merge type="files"/>
+-		</Layout>
+-
+-	</Menu> <!-- End Settings -->
 +	</Menu>		 <!-- End System Settings -->
  
  	<Layout>


Index: lxmenu-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmenu-data/devel/lxmenu-data.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lxmenu-data.spec	25 Jul 2009 11:31:03 -0000	1.3
+++ lxmenu-data.spec	5 Dec 2009 23:27:23 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           lxmenu-data
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Data files for the LXDE menu
 
 Group:          User Interface/Desktops
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-3
+- Move Accessibility to Utilities
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild