- rel 3

- ignore menu for unallocated apps (else we get a submenu with everything in it)

Changed files:
    vfmg-ignore-OnlyUnallocated.patch -> 1.1
    vfmg.spec -> 1.64

diff --git a/vfmg-ignore-OnlyUnallocated.patch b/vfmg-ignore-OnlyUnallocated.patch
new file mode 100644 (file)
index 0000000..965f11f
--- /dev/null
+++ b/vfmg-ignore-OnlyUnallocated.patch
@@ -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,

diff --git a/vfmg.spec b/vfmg.spec
index 17a0be096d6fcc47f10ea89ca43bdbe20ba53b0b..9c8c5c24a51f305f9b54b2dfba587cb9bfa2964e 100644 (file)
--- a/vfmg.spec
+++ b/vfmg.spec
@@ -3,12 +3,13 @@ Summary:      VFolders Menu Generator
 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@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
@@ -51,6 +52,7 @@ generowanie menu dla zarządców okien o określonych godzinach.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT