Mailinglist Archive: opensuse-commit (1003 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package xdg-menu
checked in at Sun Jun 3 22:08:36 CEST 2007.

--------
--- xdg-menu/xdg-menu.changes   2007-02-06 11:51:48.000000000 +0100
+++ /mounts/work_src_done/STABLE/xdg-menu/xdg-menu.changes      2007-06-01 11:23:19.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun  1 11:19:02 CEST 2007 - nadvornik@xxxxxxx
+
+- do not output top-level menu in icewm format [#273232]
+
+-------------------------------------------------------------------

New:
----
  xdg-menu-icewm.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xdg-menu.spec ++++++
--- /var/tmp/diff_new_pack.W18229/_old  2007-06-03 22:07:47.000000000 +0200
+++ /var/tmp/diff_new_pack.W18229/_new  2007-06-03 22:07:47.000000000 +0200
@@ -12,7 +12,7 @@
 
 Name:           xdg-menu
 Version:        0.2
-Release:        89
+Release:        106
 Summary:        XDG Menus for WindowMaker and other Window Managers
 License:        GNU General Public License (GPL)
 Group:          System/GUI/Other
@@ -25,6 +25,7 @@
 Patch2:         %name-twm.patch
 Patch3:         %name-xfce4-icon.patch
 Patch4:         %name-gnome-path.patch
+Patch5:         %name-icewm.patch
 
 %description
 This package contains a Perl script which converts XDG menus to formats
@@ -43,6 +44,7 @@
 %patch2
 %patch3
 %patch4
+%patch5
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,7 +59,9 @@
 /usr/bin/xdg_menu
 /usr/bin/xdg_menu_su
 
-%changelog -n xdg-menu
+%changelog
+* Fri Jun 01 2007 - nadvornik@xxxxxxx
+- do not output top-level menu in icewm format [#273232]
 * Tue Feb 06 2007 - nadvornik@xxxxxxx
 - added Requires: xterm [#242136]
 * Mon Jan 22 2007 - nadvornik@xxxxxxx

++++++ xdg-menu-icewm.patch ++++++
--- xdg_menu
+++ xdg_menu
@@ -1549,7 +1549,7 @@
        my $menu_name = $menu->{'PrepName'};
        
        $output .= ' ' x $indent;
-       $output .= "menu \"$menu_name\" folder {\n";
+       $output .= "menu \"$menu_name\" folder {\n" if $indent > 0; #skip toplevel menu, bug 273232
        
        foreach my $entry (@{$menu->{'entries'}}) {
                if ($entry->{type} eq 'desktop') {
@@ -1570,7 +1570,7 @@
                
        }
        $output .= ' ' x $indent;
-       $output .= "}\n";
+       $output .= "}\n" if $indent > 0;
        
        return $output;
 }

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx