Hello community, here is the log from the commit of package mate-menus for openSUSE:Factory checked in at 2018-03-20 21:57:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-menus (Old) and /work/SRC/openSUSE:Factory/.mate-menus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-menus" Tue Mar 20 21:57:14 2018 rev:10 rq:586568 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mate-menus/mate-menus.changes 2017-11-14 12:53:39.198780427 +0100 +++ /work/SRC/openSUSE:Factory/.mate-menus.new/mate-menus.changes 2018-03-20 21:57:54.974961345 +0100 @@ -1,0 +2,10 @@ +Fri Mar 9 19:10:07 UTC 2018 - [email protected] + +- Update to version 1.20.0: + * Require GLib 2.50. + * Update translations. +- Add mate-menus-glib-2.48.patch: Restore GLib 2.48 support. +- Rename python-mate-menus to python2-mate-menus for + openSUSE Leap 15.0 and newer. + +------------------------------------------------------------------- Old: ---- mate-menus-1.18.1.tar.xz New: ---- mate-menus-1.20.0.tar.xz mate-menus-glib-2.48.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-menus.spec ++++++ --- /var/tmp/diff_new_pack.9qpk01/_old 2018-03-20 21:57:55.846929950 +0100 +++ /var/tmp/diff_new_pack.9qpk01/_new 2018-03-20 21:57:55.846929950 +0100 @@ -1,7 +1,7 @@ # # spec file for package mate-menus # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,23 +19,25 @@ %define soname libmate-menu %define sover 2 %define typelib typelib-1_0-MateMenu-2_0 -%define _version 1.18 +%define _version 1.20 Name: mate-menus -Version: 1.18.1 +Version: 1.20.0 Release: 0 Summary: MATE Desktop Menu -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/Other Url: https://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FEATURE-OPENSUSE mate-menus-glib-2.48.patch -- Restore GLib 2.48 support. +Patch0: mate-menus-glib-2.48.patch BuildRequires: intltool BuildRequires: mate-common >= %{_version} BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: update-desktop-files -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) >= 2.48 +BuildRequires: pkgconfig(glib-2.0) >= 2.48 BuildRequires: pkgconfig(gobject-introspection-1.0) Requires: %{name}-branding Recommends: %{name}-lang @@ -50,7 +52,7 @@ %package branding-upstream Summary: The MATE Desktop Menu -- Upstream Menus Definitions -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other Requires: %{name} = %{version} Supplements: packageand(%{name}:branding-upstream) @@ -73,7 +75,7 @@ %package -n %{soname}%{sover} Summary: MATE Desktop Menu -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries %description -n %{soname}%{sover} @@ -82,20 +84,32 @@ %package -n %{typelib} Summary: MATE Desktop menu bindings -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/Other %description -n %{typelib} The libmate-menu library implements the "Desktop Menu Specification" from freedesktop.org. +%if 0%{?suse_version} >= 1500 +%package -n python2-%{name} +%else %package -n python-%{name} +%endif Summary: Python Bindings for MATE Desktop Menu -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/Other Requires: %{soname}%{sover} = %{version} +%if 0%{?suse_version} >= 1500 +# python-mate-menus was last used in openSUSE Leap 42.3. +Provides: python-%{name} = %{version}-%{release} +Obsoletes: python-%{name} < %{version}-%{release} + +%description -n python2-%{name} +%else %description -n python-%{name} +%endif mate-menus contains the libmate-menu library, the layout configuration files for the MATE menu, as well as a simple menu editor. @@ -105,7 +119,7 @@ %package devel Summary: MATE Desktop Menu -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: %{soname}%{sover} = %{version} Requires: %{typelib} = %{version} @@ -122,9 +136,11 @@ %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen +export PYTHON=python2 %configure \ --disable-static make %{?_smp_mflags} V=1 @@ -139,7 +155,12 @@ %postun -n %{soname}%{sover} -p /sbin/ldconfig %files -%doc ChangeLog README COPYING +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc ChangeLog README %dir %{_sysconfdir}/xdg/menus/ %config %{_sysconfdir}/xdg/menus/mate-settings.menu %config %{_sysconfdir}/xdg/menus/mate-preferences-categories.menu @@ -155,7 +176,11 @@ %files -n %{typelib} %{_libdir}/girepository-1.0/MateMenu-2.0.typelib +%if 0%{?suse_version} >= 1500 +%files -n python2-mate-menus +%else %files -n python-mate-menus +%endif %{python_sitearch}/matemenu.so %dir %{_datadir}/mate-menus/ %{_datadir}/mate-menus/examples/ ++++++ mate-menus-1.18.1.tar.xz -> mate-menus-1.20.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-menus-1.18.1/ChangeLog new/mate-menus-1.20.0/ChangeLog --- old/mate-menus-1.18.1/ChangeLog 2017-11-08 08:47:45.000000000 +0100 +++ new/mate-menus-1.20.0/ChangeLog 2018-01-30 13:39:27.000000000 +0100 @@ -1,14 +1,63 @@ -commit c79c58e14124a5ea6585e166e0b959213c6e044d +commit 03d91014ecf7145fb82fe7412835706076d08ba8 Author: raveit65 <[email protected]> -Date: Wed Nov 8 08:46:42 2017 +0100 +Date: Tue Jan 30 13:38:24 2018 +0100 - release 1.18.1 + release 1.20 - NEWS | 5 +++++ + NEWS | 6 +++++- configure.ac | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) + 2 files changed, 6 insertions(+), 2 deletions(-) -commit b185f145d62aa0eaab993a1415fee668e3459872 +commit bf7ca4c1caf392677d59544a0b8e0eef207fa12d +Author: monsta <[email protected]> +Date: Tue Jan 30 15:23:26 2018 +0300 + + revert ChangeLog commit + + ChangeLog | 1691 +------------------------------------------------------------ + 1 file changed, 2 insertions(+), 1689 deletions(-) + +commit b72264f40e58f49172ae1b5d4423486bef3ad2c8 +Author: raveit65 <[email protected]> +Date: Tue Jan 30 12:40:38 2018 +0100 + + sync with transifex + + po/ko.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4a3142e3334ba91574cf9443b6dd0e9c5012202c +Author: raveit65 <[email protected]> +Date: Tue Jan 30 12:36:11 2018 +0100 + + bump gio version to 2.50.0 + + ChangeLog | 1691 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + configure.ac | 2 +- + 2 files changed, 1690 insertions(+), 3 deletions(-) + +commit e6a66f3be9cef78fb8809f7a69c5576436ec07ae +Author: monsta <[email protected]> +Date: Sat Jan 27 23:00:39 2018 +0300 + + require GLib 2.50.0 + + bump version like in other packages for 1.20 release + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fbcfe37b673056f71323a1ff1d90a44fe1323195 +Author: raveit65 <[email protected]> +Date: Thu Nov 9 16:06:00 2017 +0100 + + pre-bump version + + NEWS | 2 ++ + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 5debae44d2c4e2e5744439a1f88135c93592b17e Author: raveit65 <[email protected]> Date: Wed Nov 8 08:43:37 2017 +0100 @@ -18,7 +67,16 @@ po/[email protected] | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -commit d189658f8727140a0ca4f31e191f839aa7d5fc5e +commit 80f0680877363051e527835032b4749fe022000d +Author: raveit65 <[email protected]> +Date: Fri Oct 13 08:50:51 2017 +0200 + + update to 1.19.0 + + NEWS | 4 ++++ + 1 file changed, 4 insertions(+) + +commit b0e8faf0a9b664380c06633b26c90eff31f076c2 Author: raveit65 <[email protected]> Date: Fri Oct 13 08:28:30 2017 +0200 @@ -133,7 +191,7 @@ po/zh_TW.po | 2 +- 107 files changed, 169 insertions(+), 166 deletions(-) -commit d5241ab60eda938fe26b666be7978b0251e51a3d +commit 923a0d96b4de690e48e1ebd2efe9ff544cc7b254 Author: rezso <[email protected]> Date: Tue Aug 15 23:58:52 2017 +0200 @@ -144,6 +202,43 @@ libmenu/matemenu-tree.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) +commit 91778df1025aefd86dd1074b6f483657a65f83b2 +Author: raveit65 <[email protected]> +Date: Tue Jul 18 15:16:55 2017 +0200 + + update issue_template + + .github/issue_template.md | 3 +++ + 1 file changed, 3 insertions(+) + +commit 19a9b4ce354a440032095ac047be9006d0b1d781 +Author: raveit65 <[email protected]> +Date: Thu Jun 8 19:06:13 2017 +0200 + + create issue_template.md + + .github/issue_template.md | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit b85a730182e74a366795f1d8cabf7eb05bc99b45 +Author: Piotr Drąg <[email protected]> +Date: Sat May 20 17:45:22 2017 +0200 + + Restore Polish translation credits from GNOME + + po/gnome-copyrights.txt | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit b77d95301c18e2979943b2a62113bb164b266d54 +Author: raveit65 <[email protected]> +Date: Thu Mar 30 17:55:40 2017 +0200 + + pre-bump version + + NEWS | 2 ++ + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + commit afed6035af51c699c4416f1109fa6cd99bb3b897 Author: monsta <[email protected]> Date: Sun Mar 12 20:31:02 2017 +0300 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-menus-1.18.1/NEWS new/mate-menus-1.20.0/NEWS --- old/mate-menus-1.18.1/NEWS 2017-11-08 08:46:18.000000000 +0100 +++ new/mate-menus-1.20.0/NEWS 2018-01-30 13:37:22.000000000 +0100 @@ -1,7 +1,14 @@ -### mate-menus 1.18.1 +### mate-menus 1.20.0 + + * Translations update + * bump gio version to 2.50.0 + * require GLib 2.50.0 + +### mate-menus 1.19.0 * Translations update * make mate-applications-merged symlink + * Restore Polish translation credits from GNOME ### mate-menus 1.18.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-menus-1.18.1/configure new/mate-menus-1.20.0/configure --- old/mate-menus-1.18.1/configure 2017-11-08 08:47:34.000000000 +0100 +++ new/mate-menus-1.20.0/configure 2018-01-30 13:39:16.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mate-menus 1.18.1. +# Generated by GNU Autoconf 2.69 for mate-menus 1.20.0. # # Report bugs to <http://www.mate-desktop.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='mate-menus' PACKAGE_TARNAME='mate-menus' -PACKAGE_VERSION='1.18.1' -PACKAGE_STRING='mate-menus 1.18.1' +PACKAGE_VERSION='1.20.0' +PACKAGE_STRING='mate-menus 1.20.0' PACKAGE_BUGREPORT='http://www.mate-desktop.org' PACKAGE_URL='' @@ -1414,7 +1414,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 mate-menus 1.18.1 to adapt to many kinds of systems. +\`configure' configures mate-menus 1.20.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1484,7 +1484,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mate-menus 1.18.1:";; + short | recursive ) echo "Configuration of mate-menus 1.20.0:";; esac cat <<\_ACEOF @@ -1618,7 +1618,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mate-menus configure 1.18.1 +mate-menus configure 1.20.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1987,7 +1987,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mate-menus $as_me 1.18.1, which was +It was created by mate-menus $as_me 1.20.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2852,7 +2852,7 @@ # Define the identity of the package. PACKAGE='mate-menus' - VERSION='1.18.1' + VERSION='1.20.0' cat >>confdefs.h <<_ACEOF @@ -14451,12 +14451,12 @@ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.36.0 gio-2.0 >= 2.15.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.36.0 gio-2.0 >= 2.15.2") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.36.0 gio-2.0 >= 2.15.2" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14468,12 +14468,12 @@ pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.36.0 gio-2.0 >= 2.15.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.36.0 gio-2.0 >= 2.15.2") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.36.0 gio-2.0 >= 2.15.2" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14494,14 +14494,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.36.0 gio-2.0 >= 2.15.2" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.36.0 gio-2.0 >= 2.15.2" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.36.0 gio-2.0 >= 2.15.2) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0) were not met: $GLIB_PKG_ERRORS @@ -15681,7 +15681,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mate-menus $as_me 1.18.1, which was +This file was extended by mate-menus $as_me 1.20.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15747,7 +15747,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mate-menus config.status 1.18.1 +mate-menus config.status 1.20.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-menus-1.18.1/configure.ac new/mate-menus-1.20.0/configure.ac --- old/mate-menus-1.18.1/configure.ac 2017-11-08 08:45:22.000000000 +0100 +++ new/mate-menus-1.20.0/configure.ac 2018-01-30 13:38:01.000000000 +0100 @@ -1,6 +1,6 @@ AC_PREREQ(2.62) -AC_INIT([mate-menus], [1.18.1], [http://www.mate-desktop.org]) +AC_INIT([mate-menus], [1.20.0], [http://www.mate-desktop.org]) AC_CONFIG_SRCDIR(libmenu/matemenu-tree.h) AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz check-news]) @@ -35,7 +35,7 @@ AC_ARG_PROGRAM AM_PROG_LIBTOOL -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.36.0 gio-2.0 >= 2.15.2) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-menus-1.18.1/po/ko.po new/mate-menus-1.20.0/po/ko.po --- old/mate-menus-1.18.1/po/ko.po 2017-11-08 08:42:13.000000000 +0100 +++ new/mate-menus-1.20.0/po/ko.po 2018-01-30 13:36:43.000000000 +0100 @@ -13,7 +13,7 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-07-01 16:24+0300\n" -"PO-Revision-Date: 2017-09-19 13:36+0000\n" +"PO-Revision-Date: 2017-11-14 11:52+0000\n" "Last-Translator: 박정규(Jung-Kyu Park) <[email protected]>\n" "Language-Team: Korean (http://www.transifex.com/mate/MATE/language/ko/)\n" "MIME-Version: 1.0\n" ++++++ mate-menus-glib-2.48.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AC_STDC_HEADERS AC_ARG_PROGRAM AM_PROG_LIBTOOL -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.48.0 gio-2.0 >= 2.48.0) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS)
