Hello community, here is the log from the commit of package engrampa for openSUSE:Factory checked in at 2018-03-20 21:58:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/engrampa (Old) and /work/SRC/openSUSE:Factory/.engrampa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "engrampa" Tue Mar 20 21:58:29 2018 rev:14 rq:587089 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/engrampa/engrampa.changes 2017-11-14 12:49:35.363699505 +0100 +++ /work/SRC/openSUSE:Factory/.engrampa.new/engrampa.changes 2018-03-20 21:58:57.816698707 +0100 @@ -1,0 +2,25 @@ +Fri Mar 9 19:10:07 UTC 2018 - [email protected] + +- Update to version 1.20.0: + * Require GTK+ 3.22 and GLib 2.50. + * UI files: Avoid deprecations. + * gtk-utils, fr-window: Remove some GtkStock deprecations. + * gtk-utils: Avoid deprecated gtk_icon_size_lookup_for_settings. + * fr-window: Avoid deprecated GtkMisc and GtkAlignment. + * dlg-add-folder: Avoid deprecated gtk_alignment_new(). + * build: Use a variable instead of a hardcoded file name when + cleaning. + * Avoid deprecated gdk_screen_make_display_name(). + * Don't use deprecated gtk_show_uri(). + * Avoid deprecated gdk_screen_get_number(). + * Add the button "Show the Files and Quit" in the progress + dialogue. + * build: Use PKG_CONFIG to fix cross-building. + * Add MATE's copyright to the About dialogue and Caja extension. + * 7z: Fix renaming files with password without the list + encrypted. +- Add engrampa-gtk-3.20.patch: Restore GLib 2.48 and GTK+ 3.20 + support. +- Recommend the same format packages as file-roller does. + +------------------------------------------------------------------- Old: ---- engrampa-1.18.3.tar.xz New: ---- engrampa-1.20.0.tar.xz engrampa-gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ engrampa.spec ++++++ --- /var/tmp/diff_new_pack.QOnPMK/_old 2018-03-20 21:58:58.540672640 +0100 +++ /var/tmp/diff_new_pack.QOnPMK/_new 2018-03-20 21:58:58.544672497 +0100 @@ -1,7 +1,7 @@ # # spec file for package engrampa # -# 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: engrampa -Version: 1.18.3 +Version: 1.20.0 Release: 0 Summary: MATE Desktop archive manager -License: GPL-2.0+ AND LGPL-2.0+ +License: GPL-2.0-or-later AND LGPL-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 engrampa-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch0: engrampa-gtk-3.20.patch BuildRequires: caja >= %{_version} BuildRequires: hicolor-icon-theme BuildRequires: libxml2-python @@ -32,11 +34,36 @@ BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: yelp-tools -BuildRequires: pkgconfig(glib-2.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(sm) Recommends: %{name}-lang +# Formats that we likely want to support by default. +Recommends: bzip2 +Recommends: cpio +Recommends: gzip +Recommends: p7zip +Recommends: rpm +Recommends: unar +Recommends: unzip +Recommends: xz +Recommends: zip +# Additional formats that are supported. +Suggests: lhasa +Suggests: lzip +Suggests: lzop +Suggests: rzip +Suggests: zoo +# FIXME: Formats for which we don't have packages. Some are free software that +# we could package. +#Suggests: lrzip +#Suggests: arj +#Suggests: ncompress +#Suggests: rar +#Suggests: unace +#Suggests: unalz +#Suggests: unstuff # mate-file-archiver was last used in openSUSE 13.1. Provides: mate-file-archiver = %{version} Obsoletes: mate-file-archiver < %{version} @@ -67,6 +94,7 @@ %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen @@ -81,7 +109,7 @@ %find_lang %{name} %{?no_lang_C} find %{buildroot} -type f -name "*.la" -delete -print -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post %desktop_database_postun %icon_theme_cache_postun @@ -94,7 +122,12 @@ %endif %files -%doc AUTHORS COPYING NEWS README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS NEWS README %{_bindir}/%{name} %{_libexecdir}/%{name}/ %{_datadir}/dbus-1/services/org.mate.Engrampa.service ++++++ engrampa-1.18.3.tar.xz -> engrampa-1.20.0.tar.xz ++++++ ++++ 63917 lines of diff (skipped) ++++++ engrampa-gtk-3.20.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -29,9 +29,9 @@ dnl it too, or it will never make it int dnl dnl ========================================================================== -GLIB_REQUIRED=2.50.0 -GIO_REQUIRED=2.50.0 -GTK_REQUIRED=3.22.0 +GLIB_REQUIRED=2.48.0 +GIO_REQUIRED=2.48.0 +GTK_REQUIRED=3.20.0 CAJA_REQUIRED=1.17.1 JSON_GLIB_REQUIRED=0.14.0 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -2253,7 +2253,11 @@ open_folder (GtkWindow *parent, if (folder == NULL) return; +#if GTK_CHECK_VERSION (3, 22, 0) if (! gtk_show_uri_on_window (parent, folder, GDK_CURRENT_TIME, &error)) { +#else + if (! gtk_show_uri (gtk_window_get_screen (parent), folder, GDK_CURRENT_TIME, &error)) { +#endif GtkWidget *d; char *utf8_name; char *message; --- a/src/gtk-utils.c +++ b/src/gtk-utils.c @@ -731,7 +731,11 @@ show_help_dialog (GtkWindow *parent, GError *error = NULL; uri = g_strconcat ("help:engrampa", section ? "/" : NULL, section, NULL); +#if GTK_CHECK_VERSION (3, 22, 0) if (! gtk_show_uri_on_window (parent, uri, GDK_CURRENT_TIME, &error)) { +#else + if (! gtk_show_uri (gtk_window_get_screen (parent), uri, GDK_CURRENT_TIME, &error)) { +#endif GtkWidget *dialog; dialog = _gtk_message_dialog_new (parent,
