rpms/kmenu-gnome/F-9 import.log, NONE, 1.1 .cvsignore, 1.15, 1.16 fedora-administration.patch, 1.3, 1.4 kmenu-gnome.spec, 1.17, 1.18 sources, 1.15, 1.16

Chitlesh GOORAH chitlesh at fedoraproject.org
Thu Aug 28 18:24:38 UTC 2008


Author: chitlesh

Update of /cvs/pkgs/rpms/kmenu-gnome/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32323/F-9

Modified Files:
	.cvsignore fedora-administration.patch kmenu-gnome.spec 
	sources 
Added Files:
	import.log 
Log Message:
new upstream release


--- NEW FILE import.log ---
kmenu-gnome-0_7_3-2_fc10:F-9:kmenu-gnome-0.7.3-2.fc10.src.rpm:1219947821


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	21 Feb 2008 18:57:42 -0000	1.15
+++ .cvsignore	28 Aug 2008 18:24:07 -0000	1.16
@@ -1 +1 @@
-31025-kmenu-gnome-0.7.1.tar.gz
+31025-kmenu-gnome-0.7.3.tar.gz

fedora-administration.patch:

Index: fedora-administration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/F-9/fedora-administration.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-administration.patch	21 Feb 2008 18:57:42 -0000	1.3
+++ fedora-administration.patch	28 Aug 2008 18:24:08 -0000	1.4
@@ -1,6 +1,35 @@
---- kmenu-gnome-0.7.1/xdg/kmenu-gnome.menu.orig	2008-02-20 16:08:41.000000000 +0100
-+++ kmenu-gnome-0.7.1/xdg/kmenu-gnome.menu	2008-02-20 16:11:03.000000000 +0100
-@@ -1328,54 +1328,6 @@
+--- kmenu-gnome-0.7.3/xdg/kmenu-gnome.menu.orig	2008-08-11 17:55:38.000000000 +0200
++++ kmenu-gnome-0.7.3/xdg/kmenu-gnome.menu	2008-08-11 17:56:11.000000000 +0200
+@@ -904,12 +904,13 @@
+ 			</And>
+ 		</Exclude>
+ 		<Include>
+-			<!-- Include top media players -->
++			<!-- Include top media players & mixers-->
+ 			<Filename>fedora-realplay.desktop</Filename>
+ 			<Filename>helix-player.desktop</Filename>
+ 			<Filename>hxplay.desktop</Filename>
+ 			<Filename>livna-vlc.desktop</Filename>
+ 			<Filename>miro.desktop</Filename>
++			<Filename>pavucontrol.desktop</Filename>
+ 			<Filename>realplay.desktop</Filename>
+ 			<Filename>realplayer.desktop</Filename>
+ 		</Include>
+@@ -933,11 +934,12 @@
+ 				<Category>Qt</Category>
+ 				<Category>KDE</Category>
+ 				<Category>GNOME</Category>
+-				<!-- Exclude top media players -->
++				<!-- Exclude top media players & mixers -->
+ 				<Filename>helix-player.desktop</Filename>
+ 				<Filename>hxplay.desktop</Filename>
+ 				<Filename>livna-vlc.desktop</Filename>
+ 				<Filename>miro.desktop</Filename>
++				<Filename>pavucontrol.desktop</Filename>
+ 				<Filename>realplay.desktop</Filename>
+ 				<Filename>realplayer.desktop</Filename>
+ 				<!-- Exclude Gnome apps -->
+@@ -1353,54 +1355,6 @@
  			<Filename>update-manager.desktop</Filename>
  		</Include>
  		<Menu>


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/F-9/kmenu-gnome.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kmenu-gnome.spec	21 Feb 2008 18:57:42 -0000	1.17
+++ kmenu-gnome.spec	28 Aug 2008 18:24:08 -0000	1.18
@@ -1,8 +1,8 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.7.1
-Release:    1%{?dist}
+Version:    0.7.3
+Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
 License:    GPLv2
@@ -29,9 +29,11 @@
 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/fedora-administration.menu \
-%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
+%if 0%{?fedora} == 8
+    # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196275
+    cp xdg/fedora-administration.menu \
+    %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
+%endif
 mkdir -p %{buildroot}%{_datadir}
 cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir}
 
@@ -58,7 +60,9 @@
 %files
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/%{name}.menu
-%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/fedora-administration.menu
+%if 0%{?fedora} == 8
+    %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/fedora-administration.menu
+%endif
 %{_datadir}/%{name}/
 %{_datadir}/desktop-directories/*.directory
 %{_icondir}/crystalsvg/*/*/*.png
@@ -66,6 +70,17 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Fri Aug 15 2008 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.7.3-2
+- merged F8 and F9 spec files
+
+* Mon Aug 11 2008 Ariszlo <ariszlo at gmail.com> - 0.7.3-1
+- release 0.7.3
+
+* Mon Apr 21 2008 Ariszlo <ariszlo at gmail.com> - 0.7.2-1
+- release 0.7.2
+- Split spec into two: one for Fedora 9 and one one for earlier releases
+- Removed fedora-administration.menu from the Fedora 9 package
+
 * Wed Feb 20 2008 Ariszlo <ariszlo at gmail.com> - 0.7.1-1
 - release 0.7.1
 - updated fedora-administration.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmenu-gnome/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	21 Feb 2008 18:57:42 -0000	1.15
+++ sources	28 Aug 2008 18:24:08 -0000	1.16
@@ -1 +1 @@
-23e22b8e6de980f367c0f7d7f5b7d532  31025-kmenu-gnome-0.7.1.tar.gz
+2ac93ba31eb32dce0f0472cb12b37bba  31025-kmenu-gnome-0.7.3.tar.gz




More information about the fedora-extras-commits mailing list