rpms/kmenu-gnome/devel .cvsignore, 1.3, 1.4 kmenu-gnome.spec, 1.3, 1.4 sources, 1.3, 1.4

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

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

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Log Message:
auto-import kmenu-gnome-0.6.1-2 on branch devel from kmenu-gnome-0.6.1-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2006 15:53:15 -0000	1.3
+++ .cvsignore	3 Nov 2006 19:11:04 -0000	1.4
@@ -1 +1 @@
-kmenu-gnome-0.6.0.1.tar.gz
+31025-kmenu-gnome-0.6.1.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/kmenu-gnome.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmenu-gnome.spec	15 Oct 2006 15:53:15 -0000	1.3
+++ kmenu-gnome.spec	3 Nov 2006 19:11:04 -0000	1.4
@@ -1,16 +1,15 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6.0.1
+Version:    0.6.1
 Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
 License:    GPL/LGPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
-#Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
-#Use local tarball until new release to fix #208788:
-Source:     %{name}-%{version}.tar.gz
+
+Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,13 +27,13 @@
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 mkdir -p %{buildroot}%{_icondir}/Bluecurve/{16x16,24x24,32x32,48x48}/apps
-mv %{name}/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
-mv %{name}/fc5-hide-bug196275.menu \
-%{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 \
+%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir}
 
-#Ignore dangling-relative-symlink warnings
+#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 )
@@ -44,6 +43,7 @@
 ln -s icon-office.png ooomain.png )
 ( cd %{buildroot}%{_icondir}/Bluecurve/48x48/apps
 ln -s icon-office.png ooomain.png )
+#Stock icons
 ( cd %{buildroot}%{_icondir}/crystalsvg/16x16/apps
 ln -s ../../../gnome/16x16/stock/generic/stock_calendar.png .
 ln -s ../../../gnome/16x16/stock/net/stock_contact.png .
@@ -55,8 +55,6 @@
 ln -s ../../../gnome/32x32/stock/io/stock_print.png .
 ln -s ../../../gnome/24x24/stock/document/stock_task.png . )
 ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps
-ln -s ../../../gnome/48x48/apps/accessibility-directory.png .
-#ln -s ../../../gnome/48x48/apps/gnome-system.png .
 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 . )
@@ -89,6 +87,13 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Wed Nov 01 2006 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.1-2
+- New upstream release for FE
+
+* Sat Oct 28 2006 Ariszlo <ariszlo at gmail.com> - 0.6.1-1
+- Removed link to accessibility-directory.png
+- release 0.6.1
+
 * Sun Oct 15 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.6.0.1-2
 - Removed duplicate gnome-system.png
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2006 15:53:15 -0000	1.3
+++ sources	3 Nov 2006 19:11:04 -0000	1.4
@@ -1 +1 @@
-b0759e688cafd1dcfbe6c34e9e533e33  kmenu-gnome-0.6.0.1.tar.gz
+27425ea61069ece88565220033bd7cbb  31025-kmenu-gnome-0.6.1.tar.gz