--- gnome-menus-2.13.5~/gnome-menus-2.13.5-alt-add-merge-dir.patch	1970-01-01 03:00:00 +0300
+++ gnome-menus-2.13.5~/gnome-menus-2.13.5-alt-add-merge-dir.patch	2006-05-18 18:32:31 +0400
@@ -0,0 +1,15 @@ 
+--- gnome-menus-2.13.5/libmenu/gmenu-tree.c~	2005-12-08 11:19:24 +0300
@@ -18,6 +18,7 @@ Url: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/gnome/sources/%name/%ver_major/%name-%version.tar.bz2
 #Source1: gnome-applications.menu
 #Patch: %name-2.10.2-alt-layout.patch
+Patch1: gnome-menus-2.13.5-alt-add-merge-dir.patch
 
 %define glib_ver 2.6.3
 %define gnome_vfs_ver 2.10.0
@@ -87,11 +88,11 @@ В этом пакете находит�
 %prep
 %setup -q -n %name-%version
 #%patch -p1
+%patch1 -p1
 
-# change DefaultMergeDirs to *-gnome-merged and remove the link to it
-# in applications.menu to avoid inclusion of the directory from itself.
-%__subst 's,\(\-merged\),-gnome\1,' libmenu/gmenu-tree.c
-%__subst 's,<DefaultMergeDirs[^>]*>,<!--DefaultMergeDirs-->,' layout/applications.menu
+# cleanup merging entries
+%__subst 's,<DefaultMergeDirs[^>]*>,<!-- <DefaultMergeDirs/> -->,' layout/applications.menu
+%__subst 's,<KDELegacyDirs[^>]*>,<!-- <KDELegacyDirs/> -->,' layout/applications.menu
 
 %build
 %configure \
@@ -103,9 +104,9 @@ В этом пакете находит�
 %makeinstall
 
 # These are no more needed
-#%%__install -pD -m644 %SOURCE1 %buildroot%_sysconfdir/xdg/menus/applications-gnome-merged/applications.menu
+#%%__install -pD -m644 %%SOURCE1 %buildroot%_sysconfdir/gnome/xdg/menus/applications-merged/applications.menu
 %__install -pD -m644 %buildroot%_sysconfdir/xdg/menus/applications.menu \
-%buildroot%_sysconfdir/xdg/menus/applications-gnome-merged/applications.menu
+%buildroot%_sysconfdir/gnome/xdg/menus/applications-merged/applications.menu
 
 %find_lang %name
 
@@ -114,9 +115,11 @@ В этом пакете находит�
 
 %files -f %name.lang
 %_datadir/desktop-directories/*
-%dir %_sysconfdir/xdg/menus/applications-gnome-merged
-%config %_sysconfdir/xdg/menus/applications-gnome-merged/applications.menu
-#config %_sysconfdir/xdg/menus/applications-gnome-merged/applications-gnome.menu
+%dir %_sysconfdir/gnome/
+%dir %_sysconfdir/gnome/xdg/
+%dir %_sysconfdir/gnome/xdg/menus/
+%dir %_sysconfdir/gnome/xdg/menus/applications-merged
+%config %_sysconfdir/gnome/xdg/menus/applications-merged/applications.menu
 %config %_sysconfdir/xdg/menus/preferences.menu
 %config %_sysconfdir/xdg/menus/settings.menu
 %doc AUTHORS ChangeLog NEWS README