Attachment 1498 Details for Bug 9592 – gnome-menus-2.13.5-reducehack.patch

[patch] gnome-menus-2.13.5-reducehack.patch

gnome-menus-2.13.5-reducehack.patch (text/plain), 3.36 KB, created by Sergey V Turchin on 2006-05-18 19:38:45 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey V Turchin

Created: 2006-05-18 19:38:45 MSD

Size: 3.36 KB

patch

obsolete

>diff -u'Nrpk~' gnome-menus-2.13.5~/gnome-menus-2.13.5-alt-add-merge-dir.patch gnome-menus-2.13.5/gnome-menus-2.13.5-alt-add-merge-dir.patch
>--- 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
>++++ gnome-menus-2.13.5/libmenu/gmenu-tree.c	2006-05-18 18:08:52 +0400
>+@@ -2027,6 +2027,12 @@ resolve_default_merge_dirs (GMenuTree   
>+ 
>+   load_merge_dir_with_config_dir (tree,
>+ 				  loaded_menu_files,
>++                                  "/etc/gnome/xdg",
>++                                  merge_name,
>++                                  layout);
>++
>++  load_merge_dir_with_config_dir (tree,
>++				  loaded_menu_files,
>+                                   g_get_user_config_dir (),
>+                                   merge_name,
>+                                   layout);
>diff -u'Nrpk~' gnome-menus-2.13.5~/gnome-menus.spec gnome-menus-2.13.5/gnome-menus.spec
>--- gnome-menus-2.13.5~/gnome-menus.spec	2006-02-14 03:04:48 +0300
>+++ gnome-menus-2.13.5/gnome-menus.spec	2006-05-18 18:36:45 +0400
>@@ -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[^>]*>,,' layout/applications.menu
>+# cleanup merging entries
>+%__subst 's,<DefaultMergeDirs[^>]*>,,' layout/applications.menu
>+%__subst 's,<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

Actions: View | Diff

Attachments on bug 9592: 1498