Hello community, here is the log from the commit of package mate-user-share for openSUSE:Factory checked in at 2018-03-20 21:57:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-user-share (Old) and /work/SRC/openSUSE:Factory/.mate-user-share.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-user-share" Tue Mar 20 21:57:54 2018 rev:8 rq:586600 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mate-user-share/mate-user-share.changes 2017-03-20 17:12:47.906457937 +0100 +++ /work/SRC/openSUSE:Factory/.mate-user-share.new/mate-user-share.changes 2018-03-20 21:58:21.422009105 +0100 @@ -1,0 +2,11 @@ +Fri Mar 9 19:10:07 UTC 2018 - sor.ale...@meowr.ru + +- Update to version 1.20.0: + * Require GTK+ 3.22 and GLib 2.50. + * build: Use correct macros to fix cross-build. + * don't use deprecated gtk_show_uri(). + * Update translations. +- Add mate-user-share-gtk-3.20.patch: Restore GLib 2.48 and + GTK+ 3.20 support. + +------------------------------------------------------------------- Old: ---- mate-user-share-1.18.0.tar.xz New: ---- mate-user-share-1.20.0.tar.xz mate-user-share-gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-user-share.spec ++++++ --- /var/tmp/diff_new_pack.Wz7S2u/_old 2018-03-20 21:58:22.269978574 +0100 +++ /var/tmp/diff_new_pack.Wz7S2u/_new 2018-03-20 21:58:22.273978430 +0100 @@ -1,7 +1,7 @@ # # spec file for package mate-user-share # -# 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 @@ -16,15 +16,17 @@ # -%define _version 1.18 +%define _version 1.20 Name: mate-user-share -Version: 1.18.0 +Version: 1.20.0 Release: 0 Summary: MATE Desktop file sharing for the masses -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other Url: https://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz +# PATCH-FEATURE-OPENSUSE mate-user-share-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch0: mate-user-share-gtk-3.20.patch BuildRequires: gnome-doc-utils BuildRequires: hicolor-icon-theme BuildRequires: mate-common >= %{_version} @@ -32,8 +34,8 @@ BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(gdk-x11-3.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 +BuildRequires: pkgconfig(glib-2.0) >= 2.48 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(libcaja-extension) >= %{_version} BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libnotify) @@ -49,8 +51,10 @@ %prep %setup -q +%patch0 -p1 %build +NOCONFIGURE=1 mate-autogen %configure \ --libexecdir=%{_libexecdir}/%{name} make %{?_smp_mflags} V=1 @@ -61,6 +65,7 @@ %find_lang %{name} %suse_update_desktop_file %{name}-properties +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -70,10 +75,15 @@ %desktop_database_postun %icon_theme_cache_postun %glib2_gsettings_schema_postun +%endif %files -%defattr(-,root,root) -%doc COPYING NEWS README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc NEWS README %config %{_sysconfdir}/xdg/autostart/mate-user-share-*.desktop %{_bindir}/mate-file-share-properties %{_mandir}/man?/mate-file-share-properties.?%{?ext_man} @@ -86,6 +96,5 @@ %{_datadir}/glib-2.0/schemas/org.mate.FileSharing.gschema.xml %files lang -f %{name}.lang -%defattr(-,root,root) %changelog ++++++ mate-user-share-1.18.0.tar.xz -> mate-user-share-1.20.0.tar.xz ++++++ ++++ 6723 lines of diff (skipped) ++++++ mate-user-share-gtk-3.20.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -62,8 +62,8 @@ AS_IF([test "x$enable_bluetooth" = "xyes ]) AM_CONDITIONAL(USE_BLUETOOTH, [test "$enable_bluetooth" = "yes"]) -GLIB_REQUIRED_VERSION=2.50.0 -GTK_REQUIRED_VERSION=3.22.0 +GLIB_REQUIRED_VERSION=2.48.0 +GTK_REQUIRED_VERSION=3.20.0 dnl ========================================================================== --- a/src/file-share-properties.c +++ b/src/file-share-properties.c @@ -438,7 +438,12 @@ help_button_clicked (GtkButton *button, { GError *error = NULL; +#if GTK_CHECK_VERSION (3, 22, 0) if (gtk_show_uri_on_window (GTK_WINDOW (window), "help:mate-user-share", gtk_get_current_event_time (), &error) == FALSE) { +#else + if (gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (window)), "help:mate-user-share", + gtk_get_current_event_time (), &error) == FALSE) { +#endif GtkWidget *dialog; dialog = error_dialog (_("Could not display the help contents."), error->message, GTK_WINDOW (window));
