rpms/kmenu-gnome/devel remove-system-administration.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 kmenu-gnome.spec, 1.12, 1.13 sources, 1.11, 1.12

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18401/devel

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Added Files:
	remove-system-administration.patch 
Log Message:


remove-system-administration.patch:

--- NEW FILE remove-system-administration.patch ---
--- kmenu-gnome-0.6.8/xdg/kmenu-gnome.menu.orig	2007-09-09 23:30:50.000000000 +0200
+++ kmenu-gnome-0.6.8/xdg/kmenu-gnome.menu	2007-09-10 07:25:07.000000000 +0200
@@ -1285,50 +1285,6 @@
 			<Filename>synaptic-kde.desktop</Filename>
 		</Include>
 		<Menu>
-			<Name>Administration</Name>
-			<Directory>kmenu-administration.directory</Directory>
-			<Include>
-				<And>
-				<Category>System</Category>
-				<Category>Settings</Category>
-				<Not><Or>
-				<Filename>gdmsetup.desktop</Filename>
-				<Filename>gnome-nettool.desktop</Filename>
-				<Filename>gnome-system-monitor.desktop</Filename>
-				<Filename>gslapt.desktop</Filename>
-				<Filename>qt-language-selector.desktop</Filename>
-				</Or></Not>
-				</And>
-				<Filename>boot.desktop</Filename>
-				<Filename>dropline-installer.desktop</Filename>
-				<Filename>envy.desktop</Filename>
-				<Filename>gnome-app-install.desktop</Filename>
-				<Filename>gnome-app-install-xfce.desktop</Filename>
-				<Filename>gnome-apt.desktop</Filename>
-				<Filename>gparted.desktop</Filename>
-				<Filename>network.desktop</Filename>
-				<Filename>ntfs-config.desktop</Filename>
-				<Filename>printers.desktop</Filename>
-				<Filename>sabayon.desktop</Filename>
-				<Filename>time.desktop</Filename>
-				<Filename>update-manager.desktop</Filename>
-				<Filename>users.desktop</Filename>
-				<Filename>vleasytables.desktop</Filename>
-				<!-- Include rPath Administration Tools -->
-				<Filename>authconfig-gtk.desktop</Filename>
-				<Filename>hwbrowser.desktop</Filename>
-				<Filename>net-internet-druid.desktop</Filename>
-				<Filename>net-neat.desktop</Filename>
-				<Filename>net-swat.desktop</Filename>
-				<Filename>net-system-config-date.desktop</Filename>
-				<Filename>net-system-config-display.desktop</Filename>
-				<Filename>net-system-config-keyboard.desktop</Filename>
-				<Filename>net-system-config-language.desktop</Filename>
-				<Filename>net-system-config-rootpassword.desktop</Filename>
-				<Filename>net-system-config-securitylevel.desktop</Filename>
-			</Include>
-		</Menu>
-		<Menu>
 			<Name>More</Name>
 			<Include>
 				<And>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Aug 2007 20:23:51 -0000	1.11
+++ .cvsignore	12 Sep 2007 14:51:08 -0000	1.12
@@ -1 +1 @@
-31025-kmenu-gnome-0.6.7.tar.gz
+31025-kmenu-gnome-0.6.8.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/kmenu-gnome.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kmenu-gnome.spec	20 Aug 2007 20:23:51 -0000	1.12
+++ kmenu-gnome.spec	12 Sep 2007 14:51:08 -0000	1.13
@@ -1,15 +1,17 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6.7
+Version:    0.6.8
 Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
-License:    LGPLv2
+License:    GPLv2
+# GPL/LGPL: pharagraphe 3 of LGPL permits changing the license to GPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
 
 Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+Patch:      remove-system-administration.patch
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,10 +21,11 @@
 K Menu with Gnome folder and extra icons.
 
 %prep
-
 %setup -q
-
+# Remove superfluous System/Administration subdirectory:
+%patch -p1
 %build
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
@@ -78,6 +81,14 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Wed Sep 12 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.8-2
+- new upstream release
+
+* Wed Sep 12 2007 Ariszlo <ariszlo at gmail.com> - 0.6.8-1
+- release 0.6.8
+- Added include categories to fc5-hide-bug196275.menu
+- Added remove-system-administration.patch
+
 * Mon Aug 20 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.7-2
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Aug 2007 20:23:51 -0000	1.11
+++ sources	12 Sep 2007 14:51:08 -0000	1.12
@@ -1 +1 @@
-081826b3c8df92c57c7463264b885f35  31025-kmenu-gnome-0.6.7.tar.gz
+003e5d317881a78005434267a3631035  31025-kmenu-gnome-0.6.8.tar.gz