rpms/kmenu-gnome/FC-6 fedora-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/pkgs/rpms/kmenu-gnome/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25966/FC-6

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


fedora-administration.patch:

--- NEW FILE fedora-administration.patch ---
--- kmenu-gnome-0.6.9/xdg/kmenu-gnome.menu.orig	2007-11-03 13:45:18.000000000 +0100
+++ kmenu-gnome-0.6.9/xdg/kmenu-gnome.menu	2007-11-03 13:46:20.000000000 +0100
@@ -1315,52 +1315,4 @@
 		</Include>
 		<Menu>
-			<Name>Administration</Name>
-			<Directory>kmenu-administration.directory</Directory>
-			<Include>
-				<And>
-				<Or>
-				<And>
-				<Category>System</Category>
-				<Or>
-				<Category>Settings</Category>
-				<Category>Internet</Category>
-				</Or>
-				</And>
-				<Category>SystemSetup</Category>
-				<Category>X-Red-Hat-ServerConfig</Category>
-				</Or>
-				<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>
-				<Filename>update-manager.desktop</Filename>
-				</Or></Not>
-				</And>
-				<Filename>authconfig-gtk.desktop</Filename>
-				<Filename>boot.desktop</Filename>
-				<Filename>envy.desktop</Filename>
-				<Filename>fedora-gparted.desktop</Filename>
-				<Filename>foomatic-gui.desktop</Filename>
-				<Filename>galternatives.desktop</Filename>
-				<Filename>gnetconfig.desktop</Filename>
-				<Filename>gparted.desktop</Filename>
-				<Filename>hwbrowser.desktop</Filename>
-				<Filename>kde-gnetconfig-kde.desktop</Filename>
-				<Filename>liveinst.desktop</Filename>
-				<Filename>net-system-config-keyboard.desktop</Filename>
-				<Filename>net-system-config-language.desktop</Filename>
-				<Filename>net-system-config-rootpassword.desktop</Filename>
-				<Filename>network.desktop</Filename>
-				<Filename>ntfs-config.desktop</Filename>
-				<Filename>printers.desktop</Filename>
-				<Filename>sabayon.desktop</Filename>
-				<Filename>time.desktop</Filename>
-				<Filename>users.desktop</Filename>
-				<Filename>vleasytables.desktop</Filename>
-			</Include>
-		</Menu>
-		<Menu>
 			<Name>More</Name>
 			<Include>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Aug 2007 20:17:21 -0000	1.11
+++ .cvsignore	23 Nov 2007 08:20:17 -0000	1.12
@@ -1 +1 @@
-31025-kmenu-gnome-0.6.7.tar.gz
+31025-kmenu-gnome-0.6.9.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/FC-6/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:17:21 -0000	1.12
+++ kmenu-gnome.spec	23 Nov 2007 08:20:17 -0000	1.13
@@ -1,34 +1,36 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6.7
+Version:    0.6.9
 Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
-License:    LGPLv2
+License:    GPLv2
+# GPL/LGPL: v3 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:      fedora-administration.patch
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:   kdebase >= 6:3.5.1
 
 %description
 K Menu with Gnome folder and extra icons.
 
 %prep
-
 %setup -q
-
+# Remove superfluous System/Administration subdirectory:
+%patch -p1 -b .administration
 %build
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 cp xdg/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196275
-cp xdg/fc5-hide-bug196275.menu \
+cp xdg/fedora-administration.menu \
 %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 mkdir -p %{buildroot}%{_datadir}
 cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir}
@@ -36,22 +38,15 @@
 # Remove package_games_kids icons to avoid conflict with kdebase:
 rm -f %{buildroot}%{_icondir}/crystalsvg/*/apps/package_games_kids.png
 
-# Use icon-office.png in Bluecurve & ooomain.png elsewhere:
+# Use redhat-office.png in Bluecurve & Echo:
 cp xdg/redhat-openoffice.directory \
 %{buildroot}%{_datadir}/desktop-directories/kmenu-openoffice.directory
 ( cd %{buildroot}%{_icondir}/crystalsvg/16x16/apps
-ln -s ooomain.png icon-office.png )
+ln -s ooomain.png redhat-office.png )
 ( cd %{buildroot}%{_icondir}/crystalsvg/32x32/apps
-ln -s ooomain.png icon-office.png )
+ln -s ooomain.png redhat-office.png )
 ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps
-ln -s ooomain.png icon-office.png )
-# printer.png
-( cd %{buildroot}%{_icondir}/crystalsvg/16x16/devices
-ln -s gnome-dev-printer.png printer.png )
-( cd %{buildroot}%{_icondir}/crystalsvg/22x22/devices
-ln -s gnome-dev-printer.png printer.png )
-( cd %{buildroot}%{_icondir}/crystalsvg/32x32/devices
-ln -s gnome-dev-printer.png printer.png )
+ln -s ooomain.png redhat-office.png )
 
 %clean
 rm -rf %{buildroot}
@@ -71,13 +66,32 @@
 %files
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/%{name}.menu
-%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/fc5-hide-bug196275.menu
+%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/fedora-administration.menu
 %{_datadir}/%{name}/
 %{_datadir}/desktop-directories/*.directory
 %{_icondir}/crystalsvg/*/*/*.png
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Wed Nov 21 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.9-2
+- new upstream release
+
+* Sat Nov 03 2007 Ariszlo <ariszlo at gmail.com> - 0.6.9-1
+- release 0.6.9
+- Replaced fc5-hide-bug196275.menu with fedora-administration.menu
+- Replaced remove-system-administration.patch with fedora-administration.patch
+- Moved GParted, Live Install and all Server Settings into Administration
+- Replaced icon-office.png with redhat-office.png
+- Removed printer.png -> gnome-dev-printer.png symlinks
+
+* 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/pkgs/rpms/kmenu-gnome/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Aug 2007 20:17:21 -0000	1.11
+++ sources	23 Nov 2007 08:20:17 -0000	1.12
@@ -1 +1 @@
-081826b3c8df92c57c7463264b885f35  31025-kmenu-gnome-0.6.7.tar.gz
+77defb8d52ec1f4527cc4d4cc0fbc261  31025-kmenu-gnome-0.6.9.tar.gz