Hello community, here is the log from the commit of package xviewer for openSUSE:Factory checked in at 2018-03-28 10:28:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xviewer (Old) and /work/SRC/openSUSE:Factory/.xviewer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xviewer" Wed Mar 28 10:28:37 2018 rev:13 rq:587691 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xviewer/xviewer.changes 2017-11-27 22:16:21.683098653 +0100 +++ /work/SRC/openSUSE:Factory/.xviewer.new/xviewer.changes 2018-03-28 10:28:39.982904000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 15 17:02:14 UTC 2018 - [email protected] + +- Add xviewer-use-cinnamon-desktop.patch: Use cinnamon-desktop + instead of gnome-desktop. + +------------------------------------------------------------------- New: ---- xviewer-use-cinnamon-desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xviewer.spec ++++++ --- /var/tmp/diff_new_pack.Ax3Riv/_old 2018-03-28 10:28:42.122827046 +0200 +++ /var/tmp/diff_new_pack.Ax3Riv/_new 2018-03-28 10:28:42.126826902 +0200 @@ -1,7 +1,7 @@ # # spec file for package xviewer # -# 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 @@ -20,10 +20,12 @@ Version: 1.6.1 Release: 0 Summary: Fast and functional graphics viewer -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Graphics/Viewers Url: https://github.com/linuxmint/xviewer Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM xviewer-use-cinnamon-desktop.patch -- Use cinnamon-desktop instead of gnome-desktop. +Patch0: xviewer-use-cinnamon-desktop.patch BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: hicolor-icon-theme @@ -32,10 +34,10 @@ BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: yelp-tools +BuildRequires: pkgconfig(cinnamon-desktop) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.10.0 BuildRequires: pkgconfig(gtk+-unix-print-3.0) @@ -70,6 +72,7 @@ %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 gnome-autogen.sh @@ -85,10 +88,10 @@ %fdupes %{buildroot}%{_datadir} if [ -d %{buildroot}%{_datadir}/GConf/ ]; then - rm -rf %{buildroot}%{_datadir}/GConf/ + rm -r %{buildroot}%{_datadir}/GConf/ fi -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -101,7 +104,12 @@ %endif %files -%doc AUTHORS COPYING README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS README %{_bindir}/%{name} %{_libdir}/%{name}/ %{_datadir}/%{name}/ ++++++ xviewer-use-cinnamon-desktop.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -87,12 +87,11 @@ YELP_HELP_INIT GTK_REQUIRED=3.10.0 GLIB_REQUIRED=2.38.0 -GNOME_DESKTOP_REQUIRED=2.91.2 +CINNAMON_DESKTOP_REQUIRED=3.2.0 GDKPIXBUF_REQUIRED=2.4.0 GTK_PRINT_REQUIRED=3.5.4 SHARED_MIME_INFO_REQUIRED=0.20 EXEMPI_REQUIRED=1.99.5 -DESKTOP_SCHEMAS_REQUIRED=2.91.92 LIBPEAS_REQUIRED=0.7.4 LIBPEAS_GTK_REQUIRED=0.7.4 @@ -100,11 +99,10 @@ XVIEWER_MODULES="gtk+-3.0 >= $GTK_REQUIR glib-2.0 >= $GLIB_REQUIRED \ gio-2.0 >= $GLIB_REQUIRED \ gio-unix-2.0 >= $GLIB_REQUIRED \ - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED \ + cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED \ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED \ gtk+-unix-print-3.0 >= $GTK_PRINT_REQUIRED \ shared-mime-info >= $SHARED_MIME_INFO_REQUIRED \ - gsettings-desktop-schemas >= $DESKTOP_SCHEMAS_REQUIRED \ libpeas-1.0 >= $LIBPEAS_REQUIRED \ libpeas-gtk-1.0 >= $LIBPEAS_GTK_REQUIRED" --- a/src/xviewer-file-chooser.c +++ b/src/xviewer-file-chooser.c @@ -33,7 +33,7 @@ #ifndef GNOME_DESKTOP_USE_UNSTABLE_API #define GNOME_DESKTOP_USE_UNSTABLE_API #endif -#include <libgnome-desktop/gnome-desktop-thumbnail.h> +#include <libcinnamon-desktop/gnome-desktop-thumbnail.h> static char *last_dir[] = { NULL, NULL, NULL, NULL }; --- a/src/xviewer-thumbnail.c +++ b/src/xviewer-thumbnail.c @@ -31,7 +31,7 @@ #ifndef GNOME_DESKTOP_USE_UNSTABLE_API #define GNOME_DESKTOP_USE_UNSTABLE_API #endif -#include <libgnome-desktop/gnome-desktop-thumbnail.h> +#include <libcinnamon-desktop/gnome-desktop-thumbnail.h> #include "xviewer-thumbnail.h" #include "xviewer-list-store.h"
