Hello community, here is the log from the commit of package gnome-menus for openSUSE:Factory checked in at 2012-01-06 11:44:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-menus (Old) and /work/SRC/openSUSE:Factory/.gnome-menus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-menus", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-menus/gnome-menus.changes 2011-11-02 11:53:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-menus.new/gnome-menus.changes 2012-01-06 11:44:34.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Dec 8 22:18:22 UTC 2011 - [email protected] + +- Split typelib file into typelib-1_0-GMenu-3_0 subpackage. +- Add typelib-1_0-GMenu-3_0 Requires to devel subpackage. + +------------------------------------------------------------------- +Tue Nov 1 09:50:02 UTC 2011 - [email protected] + +- Update to version 3.3.1: + + libmenu: Ignore desktop entries with no Name or Exec key. + + Layout: Put the Other menu at the end. +- Drop gnome-menus-other-end.patch: fixed upstream. +- Drop gnome-menus-ignore-invalid-files.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- gnome-menus-3.2.0.1.tar.bz2 gnome-menus-ignore-invalid-files.patch gnome-menus-other-end.patch New: ---- gnome-menus-3.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-menus.spec ++++++ --- /var/tmp/diff_new_pack.c6WVU4/_old 2012-01-06 11:44:35.000000000 +0100 +++ /var/tmp/diff_new_pack.c6WVU4/_new 2012-01-06 11:44:35.000000000 +0100 @@ -15,21 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: gnome-menus -Version: 3.2.0.1 -Release: 1 -License: LGPLv2.1+ +Version: 3.3.1 +Release: 0 Summary: The GNOME Desktop Menu -Url: http://www.gnome.org +License: LGPL-2.1+ Group: System/GUI/GNOME -Source: http://download.gnome.org/sources/gnome-menus/3.2/%{name}-%{version}.tar.bz2 +Url: http://www.gnome.org +Source: http://download.gnome.org/sources/gnome-menus/3.3/%{name}-%{version}.tar.bz2 Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gnome-menus-other-end.patch [email protected] -- Taken from git, put Other at the end -Patch0: gnome-menus-other-end.patch -# PATCH-FIX-UPSTREAM gnome-menus-ignore-invalid-files.patch bnc#727253 bgo#662409 -- Taken from git, ignore invalid desktop files to avoid crash in gnome-shell -Patch1: gnome-menus-ignore-invalid-files.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -52,8 +46,8 @@ http://www.freedesktop.org/Standards/menu-spec %package -n libgnome-menu-3-0 -License: LGPLv2.1+ Summary: The GNOME Desktop Menu +License: LGPL-2.1+ Group: System/GUI/GNOME Requires: %{name} >= %{version} # bug437293 @@ -68,9 +62,21 @@ http://www.freedesktop.org/Standards/menu-spec +%package -n typelib-1_0-GMenu-3_0 +Summary: The GNOME Desktop Menu -- Introspection bindings +License: LGPL-2.1+ +Group: System/Libraries + +%description -n typelib-1_0-GMenu-3_0 +The package contains an implementation of the draft "Desktop Menu +Specification" from freedesktop.org + +This package provides the GObject Introspection bindings for the +libgnome-menu library. + %package branding-upstream -License: LGPLv2.1+ Summary: The GNOME Desktop Menu -- Upstream Menus Definitions +License: LGPL-2.1+ Group: System/GUI/GNOME Requires: %{name} = %{version} Provides: %{name}-branding = %{version} @@ -92,8 +98,8 @@ This package provides the upstream definitions for menus. %package editor -License: GPLv2+ Summary: Editor for the GNOME Desktop Menu +License: GPL-2.0+ Group: System/GUI/GNOME Requires: python-gobject Enhances: %{name} @@ -106,11 +112,12 @@ http://www.freedesktop.org/Standards/menu-spec %package devel -License: LGPLv2.1+ Summary: The GNOME Desktop Menu +License: LGPL-2.1+ Group: System/GUI/GNOME Requires: glib2-devel Requires: libgnome-menu-3-0 = %{version} +Requires: typelib-1_0-GMenu-3_0 = %{version} %description devel The package contains an implementation of the draft "Desktop Menu @@ -122,8 +129,6 @@ %prep %setup -q translation-update-upstream -%patch0 -p1 -%patch1 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh @@ -179,6 +184,9 @@ %files -n libgnome-menu-3-0 %defattr (-, root, root) %{_libdir}/libgnome-menu-3.so.0* + +%files -n typelib-1_0-GMenu-3_0 +%defattr(-,root,root) %{_libdir}/girepository-1.0/GMenu-3.0.typelib %files lang -f %{name}-3.0.lang ++++++ gnome-menus-3.2.0.1.tar.bz2 -> gnome-menus-3.3.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-menus-3.2.0.1/ChangeLog new/gnome-menus-3.3.1/ChangeLog --- old/gnome-menus-3.2.0.1/ChangeLog 2011-09-28 09:11:21.000000000 +0200 +++ new/gnome-menus-3.3.1/ChangeLog 2011-10-24 13:49:51.000000000 +0200 @@ -1,6 +1,48 @@ +commit fbabc41cb6f2c6520f9f117137fa296a7f8340f3 +Author: Florian Müllner <[email protected]> +Date: 2011-10-21 + + libmenu: Ignore invalid desktop entries + + Both "Name" and "Exec" are mandatory keys according to the desktop + entry spec; some .desktop files missing one or the other have been + spotted in the while, so ignore them explicitly. + + https://bugzilla.gnome.org/show_bug.cgi?id=662409 + +M libmenu/desktop-entries.c + +commit 2179d84e1d7ce5a5b79f2736bf64a13e7bca1b4d +Author: Vincent Untz <[email protected]> +Date: 2011-10-07 + + layout: Put the Other menu at the end + + It's really a special menu, which should not be handled with + alphabetical order. + +M layout/applications.menu + +commit 480edac95baba553b3cfc471817779e50a367871 +Author: Vincent Untz <[email protected]> +Date: 2011-09-28 + + release: post-release bump to 3.2.1 + +M configure.ac + +commit 2d5915b925791d2d3bd736704a8706553455bd26 +Author: Vincent Untz <[email protected]> +Date: 2011-09-28 + + release: 3.2.0.1 + +M NEWS +M configure.ac + commit f1c76629d33a616089a15bd034708d21e8bd9a87 Author: Vincent Untz <[email protected]> -Date: 2011-09-27 +Date: 2011-09-27 editor: Fix to work with latest pygi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-menus-3.2.0.1/NEWS new/gnome-menus-3.3.1/NEWS --- old/gnome-menus-3.2.0.1/NEWS 2011-09-28 09:11:53.000000000 +0200 +++ new/gnome-menus-3.3.1/NEWS 2011-10-24 13:50:53.000000000 +0200 @@ -1,3 +1,15 @@ +============= +Version 3.3.1 +============= + + libmenu + + * Ignore desktop entries with no Name or Exec key (Florian Müllner) + + Layout + + * Put the Other menu at the end (Vincent) + =============== Version 3.2.0.1 =============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-menus-3.2.0.1/configure new/gnome-menus-3.3.1/configure --- old/gnome-menus-3.2.0.1/configure 2011-09-28 09:12:11.000000000 +0200 +++ new/gnome-menus-3.3.1/configure 2011-10-24 13:51:34.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gnome-menus 3.2.0.1. +# Generated by GNU Autoconf 2.68 for gnome-menus 3.3.1. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus>. # @@ -710,8 +710,8 @@ # Identity of this package. PACKAGE_NAME='gnome-menus' PACKAGE_TARNAME='gnome-menus' -PACKAGE_VERSION='3.2.0.1' -PACKAGE_STRING='gnome-menus 3.2.0.1' +PACKAGE_VERSION='3.3.1' +PACKAGE_STRING='gnome-menus 3.3.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus' PACKAGE_URL='' @@ -1514,7 +1514,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnome-menus 3.2.0.1 to adapt to many kinds of systems. +\`configure' configures gnome-menus 3.3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1584,7 +1584,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-menus 3.2.0.1:";; + short | recursive ) echo "Configuration of gnome-menus 3.3.1:";; esac cat <<\_ACEOF @@ -1705,7 +1705,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-menus configure 3.2.0.1 +gnome-menus configure 3.3.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2074,7 +2074,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-menus $as_me 3.2.0.1, which was +It was created by gnome-menus $as_me 3.3.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2891,7 +2891,7 @@ # Define the identity of the package. PACKAGE='gnome-menus' - VERSION='3.2.0.1' + VERSION='3.3.1' cat >>confdefs.h <<_ACEOF @@ -2992,7 +2992,7 @@ # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -LIB_MENU_LT_VERSION=0:0:0 +LIB_MENU_LT_VERSION=0:1:0 GETTEXT_PACKAGE=gnome-menus-3.0 @@ -14215,7 +14215,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-menus $as_me 3.2.0.1, which was +This file was extended by gnome-menus $as_me 3.3.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14281,7 +14281,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-menus config.status 3.2.0.1 +gnome-menus config.status 3.3.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-menus-3.2.0.1/configure.ac new/gnome-menus-3.3.1/configure.ac --- old/gnome-menus-3.2.0.1/configure.ac 2011-09-28 09:11:30.000000000 +0200 +++ new/gnome-menus-3.3.1/configure.ac 2011-10-24 13:51:05.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ(2.62) -AC_INIT([gnome-menus], [3.2.0.1], +AC_INIT([gnome-menus], [3.3.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus]) AC_CONFIG_SRCDIR(libmenu/gmenu-tree.h) @@ -20,7 +20,7 @@ # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -LIB_MENU_LT_VERSION=0:0:0 +LIB_MENU_LT_VERSION=0:1:0 AC_SUBST(LIB_MENU_LT_VERSION) GETTEXT_PACKAGE=gnome-menus-3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-menus-3.2.0.1/layout/applications.menu new/gnome-menus-3.3.1/layout/applications.menu --- old/gnome-menus-3.2.0.1/layout/applications.menu 2011-03-31 08:48:41.000000000 +0200 +++ new/gnome-menus-3.3.1/layout/applications.menu 2011-10-24 13:48:17.000000000 +0200 @@ -151,4 +151,10 @@ </Include> </Menu> <!-- End Other --> + <Layout> + <Merge type="menus" /> + <Menuname>Other</Menuname> + <Merge type="files" /> + </Layout> + </Menu> <!-- End Applications --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-menus-3.2.0.1/libmenu/desktop-entries.c new/gnome-menus-3.3.1/libmenu/desktop-entries.c --- old/gnome-menus-3.2.0.1/libmenu/desktop-entries.c 2011-08-29 08:37:06.000000000 +0200 +++ new/gnome-menus-3.3.1/libmenu/desktop-entries.c 2011-10-24 13:48:12.000000000 +0200 @@ -256,7 +256,9 @@ const char *categories_str; entry_desktop->appinfo = g_desktop_app_info_new_from_filename (entry->path); - if (!entry_desktop->appinfo) + if (!entry_desktop->appinfo || + !g_app_info_get_name (G_APP_INFO (entry_desktop->appinfo)) || + !g_app_info_get_executable (G_APP_INFO (entry_desktop->appinfo))) { menu_verbose ("Failed to load \"%s\"\n", entry->path); return FALSE; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
