lxde/lxmenu-data
SHA256
7
0
Fork 1
forked from pool/lxmenu-data
Code Pull Requests Activity

Accepting request 40043 from X11:lxde

Browse Source 
Copy from X11:lxde/lxmenu-data based on submit request 40043 from user anubisg1

OBS-URL: https://build.opensuse.org/request/show/40043
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxmenu-data?expand=0&rev=3
This commit is contained in:
OBS User autobuild
2010-05-14 22:38:17 +00:00
committed by Git OBS Bridge
parent 640aeac6d8
commit e6c721a633
4 changed files with 119 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
lxmenu-data-0.1.1-menu-customization.patch Normal file
View File

@@ -0,0 +1,101 @@
diff -urN lxmenu-data-0.1.1.orig/layout/lxde-applications.menu lxmenu-data-0.1.1/layout/lxde-applications.menu
--- 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 2010-05-14 13:56:00.000000000 +0200
@@ -19,13 +19,14 @@
<Directory>lxde-utility.directory</Directory>
<Include>
<And>
- <Category>Utility</Category>
+ <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>
+ <Not><Category>Settings</Category></Not>
</And>
</Include>
</Menu> <!-- End Accessories -->
@@ -129,6 +130,7 @@
<And>
<Category>System</Category>
<Not><Category>Settings</Category></Not>
+ <Not><Category>SystemSetup</Category></Not>
<Not><Category>PackageManager</Category></Not>
</And>
</Include>
@@ -149,17 +151,56 @@
</Menu> <!-- End Other -->
<Menu>
- <Name>DesktopSettings</Name>
- <Directory>lxde-settings.directory</Directory>
- <OnlyUnallocated/>
+ <Name>Settings</Name>
+ <Directory>lxde-menu-system.directory</Directory>
+ <Menu>
+ <Name>Preferences</Name>
+ <Directory>lxde-settings.directory</Directory>
+ <Include>
+ <And>
+ <Category>Settings</Category>
+ <Not>
+ <Or>
+ <Category>System</Category>
+ <Filename>gnomecc.desktop</Filename>
+ <Filename>lxcc.desktop</Filename>
+ </Or>
+ </Not>
+ </And>
+ </Include>
+ </Menu>
+
+ <!-- System Settings -->
+ <Menu>
+ <Name>Administration</Name>
+ <Directory>lxde-settings-system.directory</Directory>
+ <Include>
+ <And>
+ <Or>
+ <Category>PackageManager</Category>
+ <Category>SystemSetup</Category>
+ <And>
+ <Category>Settings</Category>
+ <Category>System</Category>
+ </And>
+ </Or>
+ <Not>
+ <Or>
+ <Category>X-SuSE-YaST</Category>
+ <Filename>lxcc.desktop</Filename>
+ </Or>
+ </Not>
+ </And>
+ </Include>
+ </Menu> <!-- End System Settings -->
+
<Include>
- <Or>
- <Category>Settings</Category>
- <Category>PackageManager</Category>
- <Category>System</Category>
- </Or>
+ <Filename>lxcc.desktop</Filename>
</Include>
+
<Layout>
+ <Menuname>Preferences</Menuname>
+ <Menuname>Administration</Menuname>
<Merge type="menus"/>
<Merge type="files"/>
</Layout>
@@ -170,7 +211,7 @@
<Merge type="files"/>
<Merge type="menus"/>
<Separator/>
- <Menuname>DesktopSettings</Menuname>
+ <Menuname>Settings</Menuname>
</Layout>
</Menu> <!-- End Applications -->

51
lxmenu-data-0.1.1-restore-system.patch
View File

@@ -1,51 +0,0 @@
diff -uNr old-lxmenu-data-0.1.1/layout/lxde-applications.menu lxmenu-data-0.1.1/layout/lxde-applications.menu
--- old-lxmenu-data-0.1.1/layout/lxde-applications.menu 2009-05-19 18:52:11.000000000 +0200
+++ lxmenu-data-0.1.1/layout/lxde-applications.menu 2009-09-14 19:46:46.000000000 +0200
@@ -150,16 +150,41 @@
<Menu>
<Name>DesktopSettings</Name>
- <Directory>lxde-settings.directory</Directory>
- <OnlyUnallocated/>
+ <Directory>lxde-menu-system.directory</Directory>
<Include>
- <Or>
- <Category>Settings</Category>
<Category>PackageManager</Category>
- <Category>System</Category>
- </Or>
</Include>
+ <Menu>
+ <Name>Preferences</Name>
+ <Directory>lxde-settings.directory</Directory>
+ <Include>
+ <And>
+ <Category>Settings</Category>
+ <Not>
+ <Or>
+ <Category>System</Category>
+ <Filename>gnomecc.desktop</Filename>
+ </Or>
+ </Not>
+ </And>
+ </Include>
+ </Menu>
+
+ <!-- System Settings -->
+ <Menu>
+ <Name>Administration</Name>
+ <Directory>lxde-settings-system.directory</Directory>
+ <Include>
+ <And>
+ <Category>Settings</Category>
+ <Category>System</Category>
+ </And>
+ </Include>
+ </Menu> <!-- End System Settings -->
+
<Layout>
+ <Menuname>Preferences</Menuname>
+ <Menuname>Administration</Menuname>
<Merge type="menus"/>
<Merge type="files"/>
</Layout>

12
lxmenu-data.changes
View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri May 14 14:27:47 UTC 2010 - andrea@opensuse.org
- Rename guido patch to lxmenu-data-0.1.1-menu-customization.patch
- added patch tag as LXDE packaging team guidelines
- fixed BuildRequires
-------------------------------------------------------------------
Fri May 14 11:46:08 UTC 2010 - guido+opensuse.org@berhoerster.name
- clean up and simplify menu structure
-------------------------------------------------------------------
Tue Dec 15 14:15:27 UTC 2009 - andrea@opensuse.org

10
lxmenu-data.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package lxmenu-data (Version 0.1.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,12 +20,14 @@
Name: lxmenu-data
Version: 0.1.1
Release: 1
Release: 2
License: GPL
Source0: %{name}-%{version}.tar.bz2
Patch0: %name-%version-restore-system.patch
# PATCH-FEATURE-OPENSUSE lxmenu-data-0.1.1-menu-customization.patch -- Guido Berhörster guido+opensuse.org@berhoerster.name
# Clean up lxde menu and improve user experience
Patch0: %{name}-0.1.1-menu-customization.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gtk2-devel pkgconfig
BuildRequires: gcc gettext-tools perl perl-XML-Parser pkgconfig
BuildRequires: autoconf automake intltool
BuildArch: noarch
Group: System/GUI/Other