Hello community, here is the log from the commit of package alacarte for openSUSE:12.1:Update:Test checked in at 2011-12-04 18:19:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/alacarte (Old) and /work/SRC/openSUSE:12.1:Update:Test/.alacarte.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alacarte", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/alacarte/alacarte.changes 2011-12-04 18:19:40.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.alacarte.new/alacarte.changes 2011-12-04 18:19:40.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Nov 5 11:16:07 UTC 2011 - [email protected] + +- Added alacarte-support-exo-desktop-item-edit.patch in order to + support exo-desktop-item-edit as an alternative to + gnome-desktop-item-edit (bnc#728482) + +------------------------------------------------------------------- New: ---- alacarte-support-exo-desktop-item-edit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alacarte.spec ++++++ --- /var/tmp/diff_new_pack.IKXnzj/_old 2011-12-04 18:19:40.000000000 +0100 +++ /var/tmp/diff_new_pack.IKXnzj/_new 2011-12-04 18:19:40.000000000 +0100 @@ -29,6 +29,8 @@ Patch0: alacarte-no-settings.menu.patch # PATCH-NEEDS-REBASE alacarte_system_edit_mode.patch [email protected] (was PATCH-FEATURE-OPENSUSE) Patch1: alacarte_system_edit_mode.patch +# PATCH-FEATURE-UPSTREAM alacarte-support-exo-desktop-item-edit.patch bnc#728482 bgo#664114 [email protected] -- Add support for exo-desktop-item-edit as an alternative to gnome-desktop-item-edit +Patch2: alacarte-support-exo-desktop-item-edit.patch BuildRequires: fdupes BuildRequires: glib2-devel BuildRequires: intltool @@ -58,6 +60,7 @@ # Needs rebase. Reenable suse_update_desktop_file call below when enabling # again # %patch1 -p0 +%patch2 -p1 %build # Patch is disabled ++++++ alacarte-support-exo-desktop-item-edit.patch ++++++ diff -ur alacarte-0.13.2.orig/Alacarte/MainWindow.py alacarte-0.13.2/Alacarte/MainWindow.py --- alacarte-0.13.2.orig/Alacarte/MainWindow.py 2011-11-05 11:02:03.910000019 +0100 +++ alacarte-0.13.2/Alacarte/MainWindow.py 2011-11-05 12:12:33.947999962 +0100 @@ -41,6 +41,7 @@ dnd_both = [dnd_items[0],] + dnd_menus drag_data = None edit_pool = [] + desktop_item_editor = util.getCommandPath(['gnome-desktop-item-edit', 'exo-desktop-item-edit']) def __init__(self, datadir, version, argv): self.file_path = datadir @@ -294,7 +295,7 @@ else: parent = menus[iter][2] file_path = os.path.join(util.getUserDirectoryPath(), util.getUniqueFileId('alacarte-made', '.directory')) - process = subprocess.Popen(['gnome-desktop-item-edit', file_path], env=os.environ) + process = subprocess.Popen([self.desktop_item_editor, file_path], env=os.environ) gobject.timeout_add(100, self.waitForNewMenuProcess, process, parent.menu_id, file_path) def on_new_item_button_clicked(self, button): @@ -307,7 +308,7 @@ else: parent = menus[iter][2] file_path = os.path.join(util.getUserItemPath(), util.getUniqueFileId('alacarte-made', '.desktop')) - process = subprocess.Popen(['gnome-desktop-item-edit', file_path], env=os.environ) + process = subprocess.Popen([self.desktop_item_editor, file_path], env=os.environ) gobject.timeout_add(100, self.waitForNewItemProcess, process, parent.menu_id, file_path) def on_new_separator_button_clicked(self, button): @@ -378,7 +379,7 @@ self.editor._MenuEditor__addUndo([item,]) if file_path not in self.edit_pool: self.edit_pool.append(file_path) - process = subprocess.Popen(['gnome-desktop-item-edit', file_path], env=os.environ) + process = subprocess.Popen([self.desktop_item_editor, file_path], env=os.environ) gobject.timeout_add(100, self.waitForEditProcess, process, file_path) def on_menu_tree_cursor_changed(self, treeview): diff -ur alacarte-0.13.2.orig/Alacarte/util.py alacarte-0.13.2/Alacarte/util.py --- alacarte-0.13.2.orig/Alacarte/util.py 2009-04-17 15:03:43.000000000 +0200 +++ alacarte-0.13.2/Alacarte/util.py 2011-11-05 11:27:45.565999997 +0100 @@ -122,6 +122,15 @@ append += 1 return new_filepath +def getCommandPath(commands): + paths = os.environ['PATH'].split(os.pathsep) + for command in commands: + for path in paths: + command_path = os.path.join(path, command) + if os.access(command_path, os.X_OK): + return command_path + return None + def getUserMenuPath(): menu_dir = None if os.environ.has_key('XDG_CONFIG_HOME'): -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
