Hello community, here is the log from the commit of package caja-extensions for openSUSE:Factory checked in at 2018-03-20 21:56:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caja-extensions (Old) and /work/SRC/openSUSE:Factory/.caja-extensions.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caja-extensions" Tue Mar 20 21:56:24 2018 rev:13 rq:586519 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/caja-extensions/caja-extensions.changes 2017-11-09 14:07:11.914563240 +0100 +++ /work/SRC/openSUSE:Factory/.caja-extensions.new/caja-extensions.changes 2018-03-20 21:56:33.153907402 +0100 @@ -1,0 +2,15 @@ +Fri Mar 9 19:10:07 UTC 2018 - [email protected] + +- Update to version 1.20.0: + * Require GTK+ 3.22 and GLib 2.50. + * open-terminal: Don't use excessive string duplication. + * Avoid deprecated gdk_screen_make_display_name(). + * sendto burn: Avoid deprecated gtk_show_uri(). + * Fix the libcaja_gksu_la_LDFLAGS variable declaration. + * xattr-tags: Fix extension description. + * README: Added development info. + * Update translations. +- Add caja-extensions_gtk-3.20.patch: Restore GLib 2.48 and + GTK+ 3.20 support. + +------------------------------------------------------------------- Old: ---- caja-extensions-1.18.2.tar.xz New: ---- caja-extensions-1.20.0.tar.xz caja-extensions_gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caja-extensions.spec ++++++ --- /var/tmp/diff_new_pack.BJoAqX/_old 2018-03-20 21:56:33.997877014 +0100 +++ /var/tmp/diff_new_pack.BJoAqX/_new 2018-03-20 21:56:34.001876870 +0100 @@ -1,7 +1,7 @@ # # spec file for package caja-extensions # -# 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,22 +16,24 @@ # -%define _version 1.18 +%define _version 1.20 Name: caja-extensions -Version: 1.18.2 +Version: 1.20.0 Release: 0 Summary: Set of extensions for Caja, the MATE file manager -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 caja-extensions_use-xdgsu.patch [email protected] -- Use xdg-su instead of a direct gksu call in caja-gksu. Patch0: %{name}_use-xdgsu.patch +# PATCH-FEATURE-OPENSUSE caja-extensions_gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch1: caja-extensions_gtk-3.20.patch BuildRequires: mate-common >= %{_version} BuildRequires: pkgconfig BuildRequires: pkgconfig(dbus-glib-1) -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(gupnp-1.0) BuildRequires: pkgconfig(libcaja-extension) >= %{_version} BuildRequires: pkgconfig(mate-desktop-2.0) >= %{_version} @@ -105,7 +107,7 @@ The core package includes CD burner, archiving, email client links and devices. -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) +%if 0%{?is_opensuse} %package -n caja-extension-sendto-gajim Summary: Gajim integration for the Caja file manager Group: System/GUI/Other @@ -225,6 +227,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build NOCONFIGURE=1 mate-autogen @@ -244,11 +247,11 @@ find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} -%if 0%{?suse_version} <= 1320 && !(0%{?sle_version} >= 120100 && 0%{?is_opensuse}) -rm -f %{buildroot}%{_libdir}/caja-sendto/plugins/libnstgajim.so +%if !0%{?is_opensuse} +rm %{buildroot}%{_libdir}/caja-sendto/plugins/libnstgajim.so %endif -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post -n caja-extension-open-terminal %glib2_gsettings_schema_post @@ -263,25 +266,45 @@ %endif %files -n caja-extension-gksu -%doc AUTHORS COPYING README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS NEWS README %{_libdir}/caja/extensions-2.0/libcaja-gksu.so %{_datadir}/caja/extensions/libcaja-gksu.caja-extension %files -n caja-extension-image-converter -%doc AUTHORS COPYING README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS NEWS README %{_libdir}/caja/extensions-2.0/libcaja-image-converter.so %{_datadir}/caja-extensions/caja-image-resize.ui %{_datadir}/caja-extensions/caja-image-rotate.ui %{_datadir}/caja/extensions/libcaja-image-converter.caja-extension %files -n caja-extension-open-terminal -%doc AUTHORS COPYING README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS NEWS README %{_datadir}/caja/extensions/libcaja-open-terminal.caja-extension %{_libdir}/caja/extensions-2.0/libcaja-open-terminal.so %{_datadir}/glib-2.0/schemas/org.mate.caja-open-terminal.gschema.xml %files -n caja-extension-sendto -%doc AUTHORS COPYING README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS NEWS README %{_bindir}/caja-sendto %{_datadir}/caja-extensions/caja-sendto.ui %{_datadir}/caja/extensions/libcaja-sendto.caja-extension @@ -294,7 +317,7 @@ %{_libdir}/caja-sendto/plugins/libnstemailclient.so %{_mandir}/man?/caja-sendto.?%{?ext_man} -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) +%if 0%{?is_opensuse} %files -n caja-extension-sendto-gajim %{_libdir}/caja-sendto/plugins/libnstgajim.so %endif @@ -311,7 +334,12 @@ %{_datadir}/gtk-doc/html/caja-sendto/ %files -n caja-extension-share -%doc AUTHORS ChangeLog COPYING README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS NEWS README %{_datadir}/caja/extensions/libcaja-share.caja-extension %{_datadir}/caja-extensions/share-dialog.ui %{_libdir}/caja/extensions-2.0/libcaja-share.so ++++++ caja-extensions-1.18.2.tar.xz -> caja-extensions-1.20.0.tar.xz ++++++ ++++ 9395 lines of diff (skipped) ++++++ caja-extensions_gtk-3.20.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -12,8 +12,8 @@ AC_PROG_MAKE_SET CAJA_REQUIRED=1.17.1 LIBMATE_DESKTOP_REQUIRED=1.17.0 -GLIB_REQUIRED=2.50.0 -GTK_REQUIRED=3.22.0 +GLIB_REQUIRED=2.48.0 +GTK_REQUIRED=3.20.0 GLIB_GSETTINGS --- a/sendto/plugins/caja-burn/caja-burn.c +++ b/sendto/plugins/caja-burn/caja-burn.c @@ -157,7 +157,11 @@ gboolean send_files (NstPlugin *plugin, copy_files_to (file_list, burn); +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (NULL, "burn:///", GDK_CURRENT_TIME, NULL); +#else + gtk_show_uri (NULL, "burn:///", GDK_CURRENT_TIME, NULL); +#endif return TRUE; }
