Hello community, here is the log from the commit of package alacarte for openSUSE:Factory checked in at 2012-06-18 17:29:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alacarte (Old) and /work/SRC/openSUSE:Factory/.alacarte.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alacarte", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/alacarte/alacarte.changes 2011-12-01 12:23:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.alacarte.new/alacarte.changes 2012-06-18 17:29:42.000000000 +0200 @@ -1,0 +2,31 @@ +Wed Jun 6 19:27:53 UTC 2012 - dims...@opensuse.org + +- Update to version 0.13.4: + + Remove old PyGTK+/PyGObject 2 version checks (bgo#676699) + + Crash on exit due to a NULL tree-view selection (bgo#676702) + + Avoid crashing if a .desktop file has no icon defined + (bgo#676700) + + Mark Alacarte as a Utility (bgo#658880) + + Unable to rearrange menu items (bgo#676987) + + Various code cleanups + + MainWindow: Don't select the destination folder after a drop + (bgo#551390) + + Don't fail when handed corrupt or invalid XML (bgo#654167) +- Changes from version 0.13.3: + + Port to GI introspection +- Update BuildRequires after port to GI Introspection: + + Removed: python-gtk, pkgconfig(libgnome-menu), + + Added: pkgconfig(libgnome-menu-3.0), pkgconfig(pygobject-3.0) +- Drop no longer needed Requires: python-gnome-menus, python-gtk: + after the port to GI Introspection, we are able to auto-detect + the needed requires. +- Add hicolor-icon-theme BuildRequires: was brought in implicit by + some other dependency before. We need it for %icon_theme_cache_* + macros. +- Add gobject-introspection BuildRequires: not a real dependency + for the build, but it brings in the typelib() dependency + generator. +- Drop alacarte-no-settings.menu.patch: fixed upstram. +- Rebase alacarte-support-exo-desktop-item-edit.patch. + +------------------------------------------------------------------- Old: ---- alacarte-0.13.2.tar.bz2 alacarte-no-settings.menu.patch New: ---- alacarte-0.13.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alacarte.spec ++++++ --- /var/tmp/diff_new_pack.2SY44l/_old 2012-06-18 17:29:43.000000000 +0200 +++ /var/tmp/diff_new_pack.2SY44l/_new 2012-06-18 17:29:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package alacarte # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,30 +16,31 @@ # - Name: alacarte -Version: 0.13.2 -Release: 13 +Version: 0.13.4 +Release: 0 Url: http://www.realistanew.com/projects/alacarte -Group: System/GUI/GNOME -License: LGPL-2.1+ Summary: Menu editor for GNOME -Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM alacarte-no-settings.menu.patch bgo#655113 vu...@opensuse.org -- Stop pretending there's a settings.menu we can edit -Patch0: alacarte-no-settings.menu.patch +License: LGPL-2.1+ +Group: System/GUI/GNOME +Source: http://download.gnome.org/sources/alacarte/0.13/%{name}-%{version}.tar.xz # PATCH-NEEDS-REBASE alacarte_system_edit_mode.patch sree...@novell.com (was PATCH-FEATURE-OPENSUSE) Patch1: alacarte_system_edit_mode.patch # PATCH-FEATURE-UPSTREAM alacarte-support-exo-desktop-item-edit.patch bnc#728482 bgo#664114 g...@opensuse.org -- 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 +# Needed for the typelib() dependency parser +BuildRequires: gobject-introspection +# Needed for %%icon_theme_cache_* macros. +BuildRequires: hicolor-icon-theme BuildRequires: intltool BuildRequires: python -BuildRequires: python-gtk BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: pkgconfig(libgnome-menu) -Requires: python-gnome-menus python-gtk python-xml +BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.2.0.1 +BuildRequires: pkgconfig(pygobject-3.0) +Requires: python-xml Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires @@ -56,7 +57,6 @@ %prep %setup -q translation-update-upstream -%patch0 -p1 # Needs rebase. Reenable suse_update_desktop_file call below when enabling # again # %patch1 -p0 ++++++ alacarte-support-exo-desktop-item-edit.patch ++++++ --- /var/tmp/diff_new_pack.2SY44l/_old 2012-06-18 17:29:43.000000000 +0200 +++ /var/tmp/diff_new_pack.2SY44l/_new 2012-06-18 17:29:43.000000000 +0200 @@ -1,47 +1,49 @@ -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 +Index: alacarte-0.13.4/Alacarte/MainWindow.py +=================================================================== +--- alacarte-0.13.4.orig/Alacarte/MainWindow.py ++++ alacarte-0.13.4/Alacarte/MainWindow.py +@@ -36,6 +36,7 @@ class MainWindow(object): + #hack to make editing menu properties work + allow_update = True + edit_pool = [] ++ desktop_item_editor = util.getCommandPath(['gnome-desktop-item-edit', 'exo-desktop-item-edit']) + + def __init__(self, datadir, version): + self.file_path = datadir +@@ -264,7 +265,7 @@ class MainWindow(object): + 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.get_menu_id(), file_path) + + def on_new_item_button_clicked(self, button): +@@ -277,7 +278,7 @@ class MainWindow(object): + 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.get_menu_id(), file_path) + + def on_new_separator_button_clicked(self, button): +@@ -338,7 +339,7 @@ class MainWindow(object): + + 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): +Index: alacarte-0.13.4/Alacarte/util.py +=================================================================== +--- alacarte-0.13.4.orig/Alacarte/util.py ++++ alacarte-0.13.4/Alacarte/util.py +@@ -107,6 +107,15 @@ def getUserDirectoryPath(): + os.makedirs(menu_dir) + return menu_dir +def getCommandPath(commands): + paths = os.environ['PATH'].split(os.pathsep) @@ -53,5 +55,5 @@ + return None + def getUserMenuPath(): - menu_dir = None - if os.environ.has_key('XDG_CONFIG_HOME'): + menu_dir = os.path.join(GLib.get_user_config_dir(), 'menus') + if not os.path.isdir(menu_dir): -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
