rpms/kmenu-gnome/F-7 .cvsignore, 1.13, 1.14 fedora-administration.patch, 1.1, 1.2 kmenu-gnome.spec, 1.14, 1.15 sources, 1.13, 1.14

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/pkgs/rpms/kmenu-gnome/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18557/F-7

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/F-7/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	23 Nov 2007 08:22:50 -0000	1.13
+++ .cvsignore	26 Jan 2008 22:26:35 -0000	1.14
@@ -1 +1 @@
-31025-kmenu-gnome-0.6.9.tar.gz
+31025-kmenu-gnome-0.7.tar.gz

fedora-administration.patch:

Index: fedora-administration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/F-7/fedora-administration.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-administration.patch	23 Nov 2007 08:22:50 -0000	1.1
+++ fedora-administration.patch	26 Jan 2008 22:26:35 -0000	1.2
@@ -1,10 +1,10 @@
---- 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 @@
+--- kmenu-gnome-0.7/xdg/kmenu-gnome.menu.orig	2008-01-19 17:26:58.000000000 +0100
++++ kmenu-gnome-0.7/xdg/kmenu-gnome.menu	2008-01-19 17:28:12.000000000 +0100
+@@ -1320,52 +1320,4 @@
  		</Include>
  		<Menu>
 -			<Name>Administration</Name>
--			<Directory>kmenu-administration.directory</Directory>
+-			<Directory>kmg-administration.directory</Directory>
 -			<Include>
 -				<And>
 -				<Or>


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/F-7/kmenu-gnome.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kmenu-gnome.spec	23 Nov 2007 08:22:50 -0000	1.14
+++ kmenu-gnome.spec	26 Jan 2008 22:26:35 -0000	1.15
@@ -1,16 +1,16 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6.9
-Release:    2%{?dist}
+Version:    0.7
+Release:    1%{?dist}
 Summary:    K Menu with Gnome directory
 
 License:    GPLv2
-# GPL/LGPL: v3 of LGPL permits changing the license to GPL
+# GPL/LGPL: Section 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
+Source:     http://kde-apps.org/CONTENT/content-files/31025-%{name}-%{version}.tar.gz
 Patch:      fedora-administration.patch
 
 BuildArchitectures: noarch
@@ -35,19 +35,6 @@
 mkdir -p %{buildroot}%{_datadir}
 cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir}
 
-# Remove package_games_kids icons to avoid conflict with kdebase:
-rm -f %{buildroot}%{_icondir}/crystalsvg/*/apps/package_games_kids.png
-
-# 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 redhat-office.png )
-( cd %{buildroot}%{_icondir}/crystalsvg/32x32/apps
-ln -s ooomain.png redhat-office.png )
-( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps
-ln -s ooomain.png redhat-office.png )
-
 %clean
 rm -rf %{buildroot}
 
@@ -59,9 +46,11 @@
 
 %post
 touch --no-create %{_icondir}/crystalsvg || :
+touch --no-create %{_icondir}/hicolor || :
 
 %preun
 touch --no-create %{_icondir}/crystalsvg || :
+touch --no-create %{_icondir}/hicolor || :
 
 %files
 %defattr(-,root,root,-)
@@ -70,9 +59,14 @@
 %{_datadir}/%{name}/
 %{_datadir}/desktop-directories/*.directory
 %{_icondir}/crystalsvg/*/*/*.png
+%{_icondir}/hicolor/*/*/*.png
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Sun Jan 20 2008 Ariszlo <ariszlo at gmail.com> - 0.7-1
+- release 0.7
+- Works with both KDE3 & KDE4
+
 * Wed Nov 21 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.9-2
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	23 Nov 2007 08:22:50 -0000	1.13
+++ sources	26 Jan 2008 22:26:35 -0000	1.14
@@ -1 +1 @@
-77defb8d52ec1f4527cc4d4cc0fbc261  31025-kmenu-gnome-0.6.9.tar.gz
+637483d69e5af796058f29529ae248f1  31025-kmenu-gnome-0.7.tar.gz