rpms/kmenu-gnome/FC-6 .cvsignore, 1.7, 1.8 kmenu-gnome.spec, 1.7, 1.8 sources, 1.7, 1.8

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31754/FC-6

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 May 2007 07:41:47 -0000	1.7
+++ .cvsignore	22 May 2007 15:07:18 -0000	1.8
@@ -1 +1 @@
-31025-kmenu-gnome-0.6.3.tar.gz
+31025-kmenu-gnome-0.6.4.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-6/kmenu-gnome.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kmenu-gnome.spec	1 May 2007 07:41:47 -0000	1.7
+++ kmenu-gnome.spec	22 May 2007 15:07:18 -0000	1.8
@@ -1,8 +1,8 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6.3
-Release:    1%{?dist}
+Version:    0.6.4
+Release:    1
 Summary:    K Menu with Gnome directory
 
 License:    GPL/LGPL
@@ -13,7 +13,7 @@
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:   kdebase >= 6:3.5.1, redhat-artwork
+Requires:   kdebase >= 6:3.5.1
 
 %description
 K Menu with Gnome folder and extra icons for Fedora Core 5 or later.
@@ -26,41 +26,25 @@
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
-mkdir -p %{buildroot}%{_icondir}/Bluecurve/{16x16,24x24,32x32,48x48}/apps
 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 \
 %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
+mkdir -p %{buildroot}%{_datadir}
 cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir}
 
-#Remove package_games_kids icons already added to kdebase:
+#Remove package_games_kids icons to avoid conflict with kdebase:
 rm -f %{buildroot}%{_icondir}/crystalsvg/*/apps/package_games_kids.png
 
-#Ignore dangling-relative-symlink warnings:
-#http://qa.mandriva.com/twiki/bin/view/Main/PackagingProblems#RpmLint_Warnings
-( cd %{buildroot}%{_icondir}/Bluecurve/16x16/apps
-ln -s icon-office.png ooomain.png )
-( cd %{buildroot}%{_icondir}/Bluecurve/24x24/apps
-ln -s icon-office.png ooomain.png )
-( cd %{buildroot}%{_icondir}/Bluecurve/32x32/apps
-ln -s icon-office.png ooomain.png )
-( cd %{buildroot}%{_icondir}/Bluecurve/48x48/apps
-ln -s icon-office.png ooomain.png )
-#Stock icons
+#Use icon-office.png in Bluecurve & ooomain.png elsewhere:
+cp xdg/redhat-openoffice.directory \
+%{buildroot}%{_datadir}/desktop-directories/kmenu-openoffice.directory
 ( cd %{buildroot}%{_icondir}/crystalsvg/16x16/apps
-ln -s ../../../gnome/16x16/stock/generic/stock_calendar.png .
-ln -s ../../../gnome/16x16/stock/net/stock_contact.png .
-ln -s ../../../gnome/16x16/stock/io/stock_print.png .
-ln -s ../../../gnome/16x16/stock/document/stock_task.png . )
+ln -s ooomain.png icon-office.png )
 ( cd %{buildroot}%{_icondir}/crystalsvg/32x32/apps
-ln -s ../../../gnome/32x32/stock/generic/stock_calendar.png .
-ln -s ../../../gnome/32x32/stock/net/stock_contact.png .
-ln -s ../../../gnome/32x32/stock/io/stock_print.png .
-ln -s ../../../gnome/24x24/stock/document/stock_task.png . )
+ln -s ooomain.png icon-office.png )
 ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps
-ln -s ../../../gnome/48x48/stock/generic/stock_calendar.png .
-ln -s ../../../gnome/48x48/stock/net/stock_contact.png .
-ln -s ../../../gnome/48x48/stock/io/stock_print.png . )
+ln -s ooomain.png icon-office.png )
 
 %clean
 rm -rf %{buildroot}
@@ -72,11 +56,9 @@
 # gtk-update-icon-cache.
 
 %post
-touch --no-create %{_icondir}/Bluecurve || :
 touch --no-create %{_icondir}/crystalsvg || :
 
 %preun
-touch --no-create %{_icondir}/Bluecurve || :
 touch --no-create %{_icondir}/crystalsvg || :
 
 %files
@@ -85,18 +67,24 @@
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/fc5-hide-bug196275.menu
 %{_datadir}/%{name}/
 %{_datadir}/desktop-directories/*.directory
-%{_icondir}/Bluecurve/*/*/*.png
 %{_icondir}/crystalsvg/*/*/*.png
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Tue May 22 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.4-1
+- new upstream release
+
+* Mon May 21 2007 Ariszlo <ariszlo at gmail.com> - 0.6.4-0.1
+- release 0.6.4
+- Removed redhat-artwork dependency
+
 * Tue May 01 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.3-1
 - New upstream release
 
 * Tue Apr 24 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.2.1-1
 - New upstream release
 
-* Mon Apr 23 2007 Ariszlo <<ariszlo at gmail.com>- 0.6.2.1-0.1
+* Mon Apr 23 2007 Ariszlo <ariszlo at gmail.com> - 0.6.2.1-0.1
 - Removed package_games_kids icons already added to kdebase
 - Preparing release 0.6.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 May 2007 07:41:47 -0000	1.7
+++ sources	22 May 2007 15:07:18 -0000	1.8
@@ -1 +1 @@
-8027045680015266fc0eb535fb4c58f2  31025-kmenu-gnome-0.6.3.tar.gz
+30a30a2192178cd4ba05f6012524a0e6  31025-kmenu-gnome-0.6.4.tar.gz