packages: vfmg/vfmg.spec, vfmg/vfmg-XDG_MENU_PREFIX.patch (NEW) - rel 4 - a...

[baggins]

Author: baggins                      Date: Tue Feb 22 11:18:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- accept XDG_MENU_PREFIX env var

---- Files affected:
packages/vfmg:
   vfmg.spec (1.64 -> 1.65) , vfmg-XDG_MENU_PREFIX.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/vfmg/vfmg.spec
diff -u packages/vfmg/vfmg.spec:1.64 packages/vfmg/vfmg.spec:1.65
--- packages/vfmg/vfmg.spec:1.64	Mon May 17 13:26:09 2010
+++ packages/vfmg/vfmg.spec	Tue Feb 22 12:18:16 2011
@@ -4,13 +4,14 @@
 Summary(pl.UTF-8):	Generator Menu opartego na VFolders
 Name:		vfmg
 Version:	0.9.95
-Release:	3
+Release:	4
 License:	GPL
 Group:		X11/Window Managers/Tools
 Vendor:		GoTaR <gotar at pld-linux.org>
 Source0:	%{name}-%{version}.tar.bz2
 # Source0-md5:	f73aaacd03bd9b8fe097cac5011f26d9
 Patch0:		%{name}-ignore-OnlyUnallocated.patch
+Patch1:		%{name}-XDG_MENU_PREFIX.patch
 URL:		http://vfmg.sourceforge.net/
 BuildRequires:	rpm-perlprov
 Requires(post,preun):	/sbin/chkconfig
@@ -54,6 +55,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -97,6 +99,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2011/02/22 11:18:16  baggins
+- rel 4
+- accept XDG_MENU_PREFIX env var
+
 Revision 1.64  2010/05/17 11:26:09  baggins
 - rel 3
 - ignore menu for unallocated apps (else we get a submenu with everything in it)

================================================================
Index: packages/vfmg/vfmg-XDG_MENU_PREFIX.patch
diff -u /dev/null packages/vfmg/vfmg-XDG_MENU_PREFIX.patch:1.1
--- /dev/null	Tue Feb 22 12:18:22 2011
+++ packages/vfmg/vfmg-XDG_MENU_PREFIX.patch	Tue Feb 22 12:18:16 2011
@@ -0,0 +1,18 @@
+--- vfmg-0.9.95/vfmg~	2011-02-22 12:03:59.971803362 +0100
++++ vfmg-0.9.95/vfmg	2011-02-22 12:16:50.471781710 +0100
+@@ -477,8 +477,14 @@
+ 
+ # read XDG menu specification
+ my $file;
++my $menu_file;
++if ($ENV{'XDG_MENU_PREFIX'}) {
++    $menu_file = "$ENV{'XDG_MENU_PREFIX'}applications.menu"
++} else {
++    $menu_file = "applications.menu";
++}
+ foreach my $tmp (@xdg_config_dirs) {
+-	open F_IN, "$tmp/applications.menu" or next;
++	open F_IN, "$tmp/$menu_file" or next;
+ 	local $/ = undef;
+ 	($file = <F_IN>) =~ y/ \t\r\n//d;
+ 	$file =~ s/<!--.*?-->//g;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vfmg/vfmg.spec?r1=1.64&r2=1.65&f=u