packages: vfmg/vfmg.spec, vfmg/vfmg-ignore-OnlyUnallocated.patch (NEW) - re...

[baggins]

Author: baggins                      Date: Mon May 17 11:26:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- ignore menu for unallocated apps (else we get a submenu with everything in it)

---- Files affected:
packages/vfmg:
   vfmg.spec (1.63 -> 1.64) , vfmg-ignore-OnlyUnallocated.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/vfmg/vfmg.spec
diff -u packages/vfmg/vfmg.spec:1.63 packages/vfmg/vfmg.spec:1.64
--- packages/vfmg/vfmg.spec:1.63	Mon Jul 28 00:21:47 2008
+++ packages/vfmg/vfmg.spec	Mon May 17 13:26:09 2010
@@ -4,12 +4,13 @@
 Summary(pl.UTF-8):	Generator Menu opartego na VFolders
 Name:		vfmg
 Version:	0.9.95
-Release:	2
+Release:	3
 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
 URL:		http://vfmg.sourceforge.net/
 BuildRequires:	rpm-perlprov
 Requires(post,preun):	/sbin/chkconfig
@@ -52,6 +53,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -95,6 +97,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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)
+
 Revision 1.63  2008/07/27 22:21:47  arekm
 - release 2
 

================================================================
Index: packages/vfmg/vfmg-ignore-OnlyUnallocated.patch
diff -u /dev/null packages/vfmg/vfmg-ignore-OnlyUnallocated.patch:1.1
--- /dev/null	Mon May 17 13:26:14 2010
+++ packages/vfmg/vfmg-ignore-OnlyUnallocated.patch	Mon May 17 13:26:09 2010
@@ -0,0 +1,27 @@
+diff -ur vfmg-0.9.95/vfmg vfmg-0.9.95.new/vfmg
+--- vfmg-0.9.95/vfmg	2006-04-19 02:02:33.000000000 +0200
++++ vfmg-0.9.95.new/vfmg	2010-05-17 13:23:39.165864707 +0200
+@@ -664,8 +664,12 @@
+ 	$#menu++;
+ 	my $mno = $#menu;
+ 	# $dirnum = $desknum + $mno;
++	my $ignore = 0;
+ 
+ 	while ( (my $tag = gettag()) ne "/Menu" ) {
++		if($tag eq 'OnlyUnallocated/') {
++			$ignore = 1;
++		}
+ 		if($tag eq 'Include') {
+ 			include($mno);
+ 			next;
+@@ -766,7 +770,9 @@
+ 		}
+ 		warn "Omitted tag: $tag\n" if $o_tags;	
+ 	}
+-	
++
++	return if ($ignore);
++
+ 	# if there was no <Directory>
+ 	$desktop[$dirnum] = {
+ 		file => $name,
================================================================

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