From a92b6026277ce209cd341b6421fba94007d922c4 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 20 Feb 2018 14:12:12 +0000 Subject: [PATCH 1/9] Fix build with newer gnome-desktop3 --- Remove_obsolete_gnome-desktop-thumbnail.patch | 57 +++++++++++++++++++ xviewer.spec | 29 +++++----- 2 files changed, 70 insertions(+), 16 deletions(-) create mode 100644 Remove_obsolete_gnome-desktop-thumbnail.patch diff --git a/Remove_obsolete_gnome-desktop-thumbnail.patch b/Remove_obsolete_gnome-desktop-thumbnail.patch new file mode 100644 index 0000000..34f71cc --- /dev/null +++ b/Remove_obsolete_gnome-desktop-thumbnail.patch @@ -0,0 +1,57 @@ +From 0e7749ba0bfac7e72c19841afcbebb10851533b4 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Fri, 14 Jul 2017 11:41:38 +0200 +Subject: [PATCH] thumbnail: Remove use of obsolete gnome-desktop-thumbnail + helper + +gnome_desktop_thumbnail_scale_down_pixbuf() is obsolete now that +gdk-pixbuf doesn't have the same bugs when shrinking images by large +factors. + +https://bugzilla.gnome.org/show_bug.cgi?id=784942 +--- + configure.ac | 2 +- + src/xviewer-thumbnail.c | 9 +++++---- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e991fd035..763fef2dd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -88,7 +88,7 @@ + GTK_REQUIRED=3.10.0 + GLIB_REQUIRED=2.38.0 + GNOME_DESKTOP_REQUIRED=2.91.2 +-GDKPIXBUF_REQUIRED=2.4.0 ++GDKPIXBUF_REQUIRED=2.36.5 + GTK_PRINT_REQUIRED=3.5.4 + SHARED_MIME_INFO_REQUIRED=0.20 + EXEMPI_REQUIRED=1.99.5 + +diff --git a/src/xviewer-thumbnail.c b/src/xviewer-thumbnail.c +index 2e9fdd02c..2cc6fdf07 100644 +--- a/src/xviewer-thumbnail.c ++++ b/src/xviewer-thumbnail.c +@@ -123,9 +123,10 @@ create_thumbnail_from_pixbuf (EogThumbData *data, + + perc = CLAMP (128.0/(MAX (width, height)), 0, 1); + +- thumb = gnome_desktop_thumbnail_scale_down_pixbuf (pixbuf, +- width*perc, +- height*perc); ++ thumb = gdk_pixbuf_scale_simple (pixbuf, ++ width*perc, ++ height*perc, ++ GDK_INTERP_HYPER); + + return thumb; + } +@@ -444,7 +445,7 @@ eog_thumbnail_fit_to_size (GdkPixbuf *thumbnail, gint dimension) + width = MAX (width * factor, 1); + height = MAX (height * factor, 1); + +- result_pixbuf = gnome_desktop_thumbnail_scale_down_pixbuf (thumbnail, width, height); ++ result_pixbuf = gdk_pixbuf_scale_simple (thumbnail, width, height, GDK_INTERP_HYPER); + + return result_pixbuf; + } diff --git a/xviewer.spec b/xviewer.spec index 92557d6..03eff28 100644 --- a/xviewer.spec +++ b/xviewer.spec @@ -7,12 +7,13 @@ Name: xviewer Version: 1.6.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Fast and functional graphics viewer License: GPLv2+ and LGPLv2+ Url: https://github.com/linuxmint/%{name} Source: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: Remove_obsolete_gnome-desktop-thumbnail.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -113,31 +114,23 @@ NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %{buildroot}%{_datadir}/appdata/*.appdata.xml +%if (0%{?rhel} && 0%{?rhel <= 7}) %post -/bin/touch %{_datadir}/icons/hicolor >&/dev/null || : -%if (0%{?fedora} && 0%{?fedora} <=24) || (0%{?rhel} && 0%{?rhel} <= 7) +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/update-desktop-database >&/dev/null || : -%endif # (0%%{?fedora} && 0%%{?fedora} <=24) || (0%%{?rhel} && 0%%{?rhel} <= 7) - %postun -if [ $1 -eq 0 ]; then - /bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : - %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : -fi -%if (0%{?fedora} && 0%{?fedora} <=24) || (0%{?rhel} && 0%{?rhel} <= 7) %{_bindir}/update-desktop-database >&/dev/null || : if [ $1 -eq 0 ] ; then - %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : + %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : + %{_bindir}/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -%endif # (0%%{?fedora} && 0%%{?fedora} <=24) || (0%%{?rhel} && 0%%{?rhel} <= 7) - %posttrans -%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : -%if (0%{?fedora} && 0%{?fedora} <=24) || (0%{?rhel} && 0%{?rhel} <= 7) %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -%endif # (0%%{?fedora} && 0%%{?fedora} <=24) || (0%%{?rhel} && 0%%{?rhel} <= 7) +%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%endif %files -f %{name}.lang @@ -171,6 +164,10 @@ fi %changelog +* Tue Feb 20 2018 Leigh Scott - 1.6.0-7 +- Fix build with newer gnome-desktop3 +- Fix scriplets + * Sun Feb 11 2018 Björn Esser - 1.6.0-6 - Rebuilt for gnome-desktop3 From b9fb411eef9ea2dac226a967b2dc76e13ff0358a Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 20 Feb 2018 14:16:23 +0000 Subject: [PATCH 2/9] fix indent --- xviewer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xviewer.spec b/xviewer.spec index 03eff28..c4961c4 100644 --- a/xviewer.spec +++ b/xviewer.spec @@ -13,7 +13,7 @@ Summary: Fast and functional graphics viewer License: GPLv2+ and LGPLv2+ Url: https://github.com/linuxmint/%{name} Source: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: Remove_obsolete_gnome-desktop-thumbnail.patch +Patch0: Remove_obsolete_gnome-desktop-thumbnail.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib From e69a8893df25d053db18573dc823d199a04c1c2a Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sun, 11 Mar 2018 07:27:45 +0000 Subject: [PATCH 3/9] Free xview from gnome-desktop requirement --- free_xviewer_gnome_dep.patch | 84 ++++++++++++++++++++++++++++++++++++ sources | 2 +- xviewer.spec | 11 +++-- 3 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 free_xviewer_gnome_dep.patch diff --git a/free_xviewer_gnome_dep.patch b/free_xviewer_gnome_dep.patch new file mode 100644 index 0000000..910449b --- /dev/null +++ b/free_xviewer_gnome_dep.patch @@ -0,0 +1,84 @@ +From 61a2da998bf447c0e9aea9d5d0c1a7472715b1df Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Sat, 10 Mar 2018 00:39:37 -0500 +Subject: [PATCH] build: Use cinnamon-desktop instead of gnome-desktop. + +--- + configure.ac | 6 ++---- + debian/control | 3 +-- + src/xviewer-file-chooser.c | 2 +- + src/xviewer-thumbnail.c | 2 +- + 4 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3b168dd..f0f8bc7 100644 +--- 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_REQUIRED \ + 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" + +diff --git a/debian/control b/debian/control +index 601b98a..ab53292 100644 +--- a/debian/control ++++ b/debian/control +@@ -15,9 +15,8 @@ Build-Depends: cdbs (>= 0.4.41), + libgtk-3-dev, + libgdk-pixbuf2.0-dev (>= 2.19.1), + libglib2.0-dev (>= 2.38.0), +- libgnome-desktop-3-dev (>= 2.91.2), ++ libcinnamon-desktop-dev (>=3.2.0), + shared-mime-info (>= 0.20), +- gsettings-desktop-schemas-dev (>= 2.91.92), + libpeas-dev (>= 0.7.4), + yelp-tools, + zlib1g-dev, +diff --git a/src/xviewer-file-chooser.c b/src/xviewer-file-chooser.c +index adaee1d..f9c952d 100644 +--- 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 ++#include + + static char *last_dir[] = { NULL, NULL, NULL, NULL }; + +diff --git a/src/xviewer-thumbnail.c b/src/xviewer-thumbnail.c +index 26ee6a0..db42124 100644 +--- 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 ++#include + + #include "xviewer-thumbnail.h" + #include "xviewer-list-store.h" diff --git a/sources b/sources index 45f9dda..275a58b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xviewer-1.6.0.tar.gz) = cd4ca94dbf6e1b66cc40244b5fe96520ad8d6d0689479343412ebf558fc0d013211ee64b7c5305fac41acb5db8d8266dbf6dd6b6422308979297c116910e77b1 +SHA512 (xviewer-1.6.1.tar.gz) = 255f35e7a08550c0f079b1475799f7d5efa7219aacc187119d13cdd1bf77c05dc5f450eb57b8f39291098e27ab2487c7b514e6ee33f1a7869e0ebf7c89964281 diff --git a/xviewer.spec b/xviewer.spec index c4961c4..e5960c9 100644 --- a/xviewer.spec +++ b/xviewer.spec @@ -6,14 +6,14 @@ Name: xviewer -Version: 1.6.0 -Release: 7%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: Fast and functional graphics viewer License: GPLv2+ and LGPLv2+ Url: https://github.com/linuxmint/%{name} Source: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: Remove_obsolete_gnome-desktop-thumbnail.patch +Patch0: %{url}/commit/61a2da998bf447c0e9aea9d5d0c1a7472715b1df.patch#/free_xviewer_gnome_dep.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -24,7 +24,7 @@ BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gnome-desktop-3.0) +BuildRequires: pkgconfig(cinnamon-desktop) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-unix-print-3.0) @@ -164,6 +164,9 @@ fi %changelog +* Sun Mar 11 2018 Leigh Scott - 1.6.1-1 +- Free xview from gnome-desktop requirement + * Tue Feb 20 2018 Leigh Scott - 1.6.0-7 - Fix build with newer gnome-desktop3 - Fix scriplets From b390fb4cbfa1bb3b08ae84b9e2ddd858669ce3ef Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sun, 11 Mar 2018 11:18:34 +0000 Subject: [PATCH 4/9] Remove unused requires --- xviewer.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xviewer.spec b/xviewer.spec index e5960c9..1b07879 100644 --- a/xviewer.spec +++ b/xviewer.spec @@ -42,7 +42,6 @@ BuildRequires: shared-mime-info BuildRequires: yelp-devel -Requires: gsettings-desktop-schemas%{?_isa} Requires: shared-mime-info%{?_isa} Requires: xapps%{?_isa} %if !0%{?bootstrap} From bd5d6ff3b30092d228a0042db6eec575ccbedb1a Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sun, 29 Apr 2018 11:24:50 +0100 Subject: [PATCH 5/9] New upstream release --- Remove_obsolete_gnome-desktop-thumbnail.patch | 57 ------------- free_xviewer_gnome_dep.patch | 84 ------------------- sources | 2 +- xviewer.spec | 37 ++++---- 4 files changed, 20 insertions(+), 160 deletions(-) delete mode 100644 Remove_obsolete_gnome-desktop-thumbnail.patch delete mode 100644 free_xviewer_gnome_dep.patch diff --git a/Remove_obsolete_gnome-desktop-thumbnail.patch b/Remove_obsolete_gnome-desktop-thumbnail.patch deleted file mode 100644 index 34f71cc..0000000 --- a/Remove_obsolete_gnome-desktop-thumbnail.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0e7749ba0bfac7e72c19841afcbebb10851533b4 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 14 Jul 2017 11:41:38 +0200 -Subject: [PATCH] thumbnail: Remove use of obsolete gnome-desktop-thumbnail - helper - -gnome_desktop_thumbnail_scale_down_pixbuf() is obsolete now that -gdk-pixbuf doesn't have the same bugs when shrinking images by large -factors. - -https://bugzilla.gnome.org/show_bug.cgi?id=784942 ---- - configure.ac | 2 +- - src/xviewer-thumbnail.c | 9 +++++---- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e991fd035..763fef2dd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -88,7 +88,7 @@ - GTK_REQUIRED=3.10.0 - GLIB_REQUIRED=2.38.0 - GNOME_DESKTOP_REQUIRED=2.91.2 --GDKPIXBUF_REQUIRED=2.4.0 -+GDKPIXBUF_REQUIRED=2.36.5 - GTK_PRINT_REQUIRED=3.5.4 - SHARED_MIME_INFO_REQUIRED=0.20 - EXEMPI_REQUIRED=1.99.5 - -diff --git a/src/xviewer-thumbnail.c b/src/xviewer-thumbnail.c -index 2e9fdd02c..2cc6fdf07 100644 ---- a/src/xviewer-thumbnail.c -+++ b/src/xviewer-thumbnail.c -@@ -123,9 +123,10 @@ create_thumbnail_from_pixbuf (EogThumbData *data, - - perc = CLAMP (128.0/(MAX (width, height)), 0, 1); - -- thumb = gnome_desktop_thumbnail_scale_down_pixbuf (pixbuf, -- width*perc, -- height*perc); -+ thumb = gdk_pixbuf_scale_simple (pixbuf, -+ width*perc, -+ height*perc, -+ GDK_INTERP_HYPER); - - return thumb; - } -@@ -444,7 +445,7 @@ eog_thumbnail_fit_to_size (GdkPixbuf *thumbnail, gint dimension) - width = MAX (width * factor, 1); - height = MAX (height * factor, 1); - -- result_pixbuf = gnome_desktop_thumbnail_scale_down_pixbuf (thumbnail, width, height); -+ result_pixbuf = gdk_pixbuf_scale_simple (thumbnail, width, height, GDK_INTERP_HYPER); - - return result_pixbuf; - } diff --git a/free_xviewer_gnome_dep.patch b/free_xviewer_gnome_dep.patch deleted file mode 100644 index 910449b..0000000 --- a/free_xviewer_gnome_dep.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 61a2da998bf447c0e9aea9d5d0c1a7472715b1df Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Sat, 10 Mar 2018 00:39:37 -0500 -Subject: [PATCH] build: Use cinnamon-desktop instead of gnome-desktop. - ---- - configure.ac | 6 ++---- - debian/control | 3 +-- - src/xviewer-file-chooser.c | 2 +- - src/xviewer-thumbnail.c | 2 +- - 4 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3b168dd..f0f8bc7 100644 ---- 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_REQUIRED \ - 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" - -diff --git a/debian/control b/debian/control -index 601b98a..ab53292 100644 ---- a/debian/control -+++ b/debian/control -@@ -15,9 +15,8 @@ Build-Depends: cdbs (>= 0.4.41), - libgtk-3-dev, - libgdk-pixbuf2.0-dev (>= 2.19.1), - libglib2.0-dev (>= 2.38.0), -- libgnome-desktop-3-dev (>= 2.91.2), -+ libcinnamon-desktop-dev (>=3.2.0), - shared-mime-info (>= 0.20), -- gsettings-desktop-schemas-dev (>= 2.91.92), - libpeas-dev (>= 0.7.4), - yelp-tools, - zlib1g-dev, -diff --git a/src/xviewer-file-chooser.c b/src/xviewer-file-chooser.c -index adaee1d..f9c952d 100644 ---- 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 -+#include - - static char *last_dir[] = { NULL, NULL, NULL, NULL }; - -diff --git a/src/xviewer-thumbnail.c b/src/xviewer-thumbnail.c -index 26ee6a0..db42124 100644 ---- 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 -+#include - - #include "xviewer-thumbnail.h" - #include "xviewer-list-store.h" diff --git a/sources b/sources index 275a58b..3db8301 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xviewer-1.6.1.tar.gz) = 255f35e7a08550c0f079b1475799f7d5efa7219aacc187119d13cdd1bf77c05dc5f450eb57b8f39291098e27ab2487c7b514e6ee33f1a7869e0ebf7c89964281 +SHA512 (xviewer-1.8.0.tar.gz) = 1eff03462978747fd1c40b3a0af9dbb355b0d74d3bde459227ac179123ce6d3b23da08152d9d4c464dbefabf185307a03dc890cdd3152cc76ffcb45445f6e73c diff --git a/xviewer.spec b/xviewer.spec index 1b07879..549af2f 100644 --- a/xviewer.spec +++ b/xviewer.spec @@ -6,14 +6,13 @@ Name: xviewer -Version: 1.6.1 +Version: 1.8.0 Release: 1%{?dist} Summary: Fast and functional graphics viewer License: GPLv2+ and LGPLv2+ Url: https://github.com/linuxmint/%{name} Source: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: %{url}/commit/61a2da998bf447c0e9aea9d5d0c1a7472715b1df.patch#/free_xviewer_gnome_dep.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -63,14 +62,14 @@ compliance. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} == %{version}-%{release} +Requires: %{name}%{?_isa} == %{version}-%{release} %description devel -This package contains the development files to developt plugins for %{name}. +This package contains the development files to develop plugins for %{name}. %package doc -Summary: Documentation files for %{name} +Summary: Documentation files for %{name} BuildArch: noarch BuildRequires: gtk-doc @@ -83,6 +82,8 @@ This package contains the documentation files for %{name}. %autosetup -p 1 NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh +# Remove zero length file +%{__rm} ChangeLog %build %configure \ @@ -98,19 +99,18 @@ NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %{buildroot}%{_libdir}/%{name}/plugins \ %{buildroot}%{_mandir}/man1 %{__install} -pm 0644 debian/%{name}.1 %{buildroot}%{_mandir}/man1 -%{_bindir}/find %{buildroot} -type f -name '*.a' -print -delete -%{_bindir}/find %{buildroot} -type f -name '*.la' -print -delete +%{_bindir}/find %{buildroot} -type f -name '*.la' -or -name '*.a' -print -delete %find_lang %{name} %check # Validate desktop-files. %{_bindir}/desktop-file-validate \ - %{buildroot}%{_datadir}/applications/*.desktop + %{buildroot}%{_datadir}/applications/*.desktop # Validate AppData-files. %{_bindir}/appstream-util validate-relax --nonet \ - %{buildroot}%{_datadir}/appdata/*.appdata.xml + %{buildroot}%{_datadir}/appdata/*.appdata.xml %if (0%{?rhel} && 0%{?rhel <= 7}) @@ -133,9 +133,7 @@ fi %files -f %{name}.lang -%dir %{_datadir}/%{name}/plugins -%dir %{_libdir}/%{name}/plugins -%doc ChangeLog README THANKS debian/changelog +%doc README THANKS debian/changelog %license AUTHORS COPYING debian/copyright %exclude %{_datadir}/%{name}/gir-1.0/ %{_bindir}/%{name} @@ -143,26 +141,29 @@ fi %{_datadir}/applications/%{name}.desktop %{_datadir}/GConf/gsettings/%{name}.convert %{_datadir}/glib-2.0/schemas/*.xml -%{_datadir}/help/*/%{name} +%{_datadir}/help/*/%{name}/ %{_datadir}/icons/hicolor/*/apps/%{name}.* -%{_datadir}/%{name} -%{_libdir}/%{name} +%{_datadir}/%{name}/ +%{_libdir}/%{name}/ %{_mandir}/man1/%{name}.1* %files devel -%{_datadir}/%{name}/gir-1.0 -%{_includedir}/%{name}-3.0 +%{_datadir}/%{name}/gir-1.0/ +%{_includedir}/%{name}-3.0/ %{_libdir}/pkgconfig/%{name}.pc %files doc -%license %{_datadir}/licenses/%{name}* %doc %{_datadir}/doc/%{name}* %doc %{_datadir}/gtk-doc +%license %{_datadir}/licenses/%{name}* %changelog +* Sun Apr 29 2018 Leigh Scott - 1.8.0-1 +- New upstream release + * Sun Mar 11 2018 Leigh Scott - 1.6.1-1 - Free xview from gnome-desktop requirement From b80556f2e74aae2b08a5dda23e49652a13cb2b46 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sun, 29 Apr 2018 11:36:44 +0100 Subject: [PATCH 6/9] Remove .la file --- xviewer.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xviewer.spec b/xviewer.spec index 549af2f..41b4d9e 100644 --- a/xviewer.spec +++ b/xviewer.spec @@ -7,7 +7,7 @@ Name: xviewer Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast and functional graphics viewer License: GPLv2+ and LGPLv2+ @@ -88,7 +88,8 @@ NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %build %configure \ --disable-silent-rules \ - --enable-gtk-doc + --enable-gtk-doc \ + --disable-static %make_build @@ -99,7 +100,7 @@ NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %{buildroot}%{_libdir}/%{name}/plugins \ %{buildroot}%{_mandir}/man1 %{__install} -pm 0644 debian/%{name}.1 %{buildroot}%{_mandir}/man1 -%{_bindir}/find %{buildroot} -type f -name '*.la' -or -name '*.a' -print -delete +%{_bindir}/find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f %find_lang %{name} @@ -161,6 +162,9 @@ fi %changelog +* Sun Apr 29 2018 Leigh Scott - 1.8.0-2 +- Remove .la file + * Sun Apr 29 2018 Leigh Scott - 1.8.0-1 - New upstream release From 6630462f105be7cb84f0377dcf86eafe55891af0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:37:48 +0000 Subject: [PATCH 7/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xviewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xviewer.spec b/xviewer.spec index 41b4d9e..da6104d 100644 --- a/xviewer.spec +++ b/xviewer.spec @@ -7,7 +7,7 @@ Name: xviewer Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast and functional graphics viewer License: GPLv2+ and LGPLv2+ @@ -162,6 +162,9 @@ fi %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Apr 29 2018 Leigh Scott - 1.8.0-2 - Remove .la file From 57dbe36e20bf474e9ee0ae97f92631b66683c637 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 16 Aug 2018 19:21:29 +0100 Subject: [PATCH 8/9] New upstream release --- sources | 2 +- xviewer.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 3db8301..a89b6e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xviewer-1.8.0.tar.gz) = 1eff03462978747fd1c40b3a0af9dbb355b0d74d3bde459227ac179123ce6d3b23da08152d9d4c464dbefabf185307a03dc890cdd3152cc76ffcb45445f6e73c +SHA512 (xviewer-1.8.1.tar.gz) = dfae8c206460133b7c62d4dcc0eb476db734d15c6da935daf30222323556796271833f530318ba7055a7655aaa861fe21f9605d5ebcb46f01496c94f1d33025a diff --git a/xviewer.spec b/xviewer.spec index da6104d..7573828 100644 --- a/xviewer.spec +++ b/xviewer.spec @@ -6,8 +6,8 @@ Name: xviewer -Version: 1.8.0 -Release: 3%{?dist} +Version: 1.8.1 +Release: 1%{?dist} Summary: Fast and functional graphics viewer License: GPLv2+ and LGPLv2+ @@ -162,6 +162,9 @@ fi %changelog +* Thu Aug 16 2018 Leigh Scott - 1.8.1-1 +- New upstream release + * Sat Jul 14 2018 Fedora Release Engineering - 1.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 188e859e53d35f830a417b4b6274c58e5b9c4964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 24 Dec 2018 13:54:40 +0100 Subject: [PATCH 9/9] Orphaned for 6+ weeks --- .gitignore | 4 - dead.package | 1 + sources | 1 - xviewer.spec | 235 --------------------------------------------------- 4 files changed, 1 insertion(+), 240 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xviewer.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4a406bf..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*~ -*.rpm -*.tar* -results_*/ diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index a89b6e2..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (xviewer-1.8.1.tar.gz) = dfae8c206460133b7c62d4dcc0eb476db734d15c6da935daf30222323556796271833f530318ba7055a7655aaa861fe21f9605d5ebcb46f01496c94f1d33025a diff --git a/xviewer.spec b/xviewer.spec deleted file mode 100644 index 7573828..0000000 --- a/xviewer.spec +++ /dev/null @@ -1,235 +0,0 @@ -# Uncomment for bootstrapping on so-name bump. -%global bootstrap 0 - -# Filter provides from plugins. -%global __provides_exclude_from ^%{_libdir}/%{name}/plugins/.*$ - - -Name: xviewer -Version: 1.8.1 -Release: 1%{?dist} -Summary: Fast and functional graphics viewer - -License: GPLv2+ and LGPLv2+ -Url: https://github.com/linuxmint/%{name} -Source: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz - -BuildRequires: desktop-file-utils -BuildRequires: libappstream-glib -BuildRequires: gnome-common -BuildRequires: intltool -BuildRequires: itstool -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(exempi-2.0) -BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(cinnamon-desktop) -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(gtk+-unix-print-3.0) -BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(libexif) -%if 0%{?fedora} || 0%{?rhel} >= 8 -BuildRequires: pkgconfig(libjpeg) -%else -BuildRequires: libjpeg-devel -%endif -BuildRequires: pkgconfig(libpeas-gtk-1.0) -BuildRequires: pkgconfig(librsvg-2.0) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: shared-mime-info -BuildRequires: yelp-devel - - -Requires: shared-mime-info%{?_isa} -Requires: xapps%{?_isa} -%if !0%{?bootstrap} -Requires: %{name}-plugins%{?_isa} -%endif # !0%%{?bootstrap} - -%if 0%{?fedora} || 0%{?rhel} >= 8 -Recommends: yelp%{?_isa} -%else -Requires: yelp%{?_isa} -%endif - -%description -Xviewer is a simple graphics viewer for the Cinnamon desktop and others -which uses the gdk-pixbuf library. It can deal with large images, and zoom -and scroll with constant memory usage. Its goals are simplicity and standards -compliance. - - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} == %{version}-%{release} - -%description devel -This package contains the development files to develop plugins for %{name}. - - -%package doc -Summary: Documentation files for %{name} - -BuildArch: noarch -BuildRequires: gtk-doc - -%description doc -This package contains the documentation files for %{name}. - - -%prep -%autosetup -p 1 -NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh - -# Remove zero length file -%{__rm} ChangeLog - -%build -%configure \ - --disable-silent-rules \ - --enable-gtk-doc \ - --disable-static - -%make_build - - -%install -%make_install -%{__mkdir} -p %{buildroot}%{_datadir}/%{name}/plugins \ - %{buildroot}%{_libdir}/%{name}/plugins \ - %{buildroot}%{_mandir}/man1 -%{__install} -pm 0644 debian/%{name}.1 %{buildroot}%{_mandir}/man1 -%{_bindir}/find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f -%find_lang %{name} - - -%check -# Validate desktop-files. -%{_bindir}/desktop-file-validate \ - %{buildroot}%{_datadir}/applications/*.desktop - -# Validate AppData-files. -%{_bindir}/appstream-util validate-relax --nonet \ - %{buildroot}%{_datadir}/appdata/*.appdata.xml - - -%if (0%{?rhel} && 0%{?rhel <= 7}) -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%{_bindir}/update-desktop-database >&/dev/null || : - -%postun -%{_bindir}/update-desktop-database >&/dev/null || : -if [ $1 -eq 0 ] ; then - %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - %{_bindir}/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%endif - - -%files -f %{name}.lang -%doc README THANKS debian/changelog -%license AUTHORS COPYING debian/copyright -%exclude %{_datadir}/%{name}/gir-1.0/ -%{_bindir}/%{name} -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/applications/%{name}.desktop -%{_datadir}/GConf/gsettings/%{name}.convert -%{_datadir}/glib-2.0/schemas/*.xml -%{_datadir}/help/*/%{name}/ -%{_datadir}/icons/hicolor/*/apps/%{name}.* -%{_datadir}/%{name}/ -%{_libdir}/%{name}/ -%{_mandir}/man1/%{name}.1* - - -%files devel -%{_datadir}/%{name}/gir-1.0/ -%{_includedir}/%{name}-3.0/ -%{_libdir}/pkgconfig/%{name}.pc - - -%files doc -%doc %{_datadir}/doc/%{name}* -%doc %{_datadir}/gtk-doc -%license %{_datadir}/licenses/%{name}* - - -%changelog -* Thu Aug 16 2018 Leigh Scott - 1.8.1-1 -- New upstream release - -* Sat Jul 14 2018 Fedora Release Engineering - 1.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Apr 29 2018 Leigh Scott - 1.8.0-2 -- Remove .la file - -* Sun Apr 29 2018 Leigh Scott - 1.8.0-1 -- New upstream release - -* Sun Mar 11 2018 Leigh Scott - 1.6.1-1 -- Free xview from gnome-desktop requirement - -* Tue Feb 20 2018 Leigh Scott - 1.6.0-7 -- Fix build with newer gnome-desktop3 -- Fix scriplets - -* Sun Feb 11 2018 Björn Esser - 1.6.0-6 -- Rebuilt for gnome-desktop3 - -* Fri Feb 09 2018 Fedora Release Engineering - 1.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Nov 17 2017 Björn Esser - 1.6.0-4 -- Add required scriptlets for EPEL7 - -* Thu Nov 16 2017 Björn Esser - 1.6.0-3 -- Redistributable build on EPEL7 - -* Thu Nov 16 2017 Björn Esser - 1.6.0-2 -- Bootstrapping on EPEL7 - -* Sat Nov 04 2017 Leigh Scott - 1.6.0-1 -- Update to 1.6.0 release - -* Thu Aug 03 2017 Fedora Release Engineering - 1.4.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.4.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jun 30 2017 Björn Esser - 1.4.3-2 -- Fix filtered provides - -* Wed Jun 28 2017 Björn Esser - 1.4.3-1 -- New upstream release (rhbz#1465898) - -* Wed May 24 2017 Björn Esser - 1.4.2-1 -- New upstream release (rhbz#1454987) - -* Mon May 08 2017 Björn Esser - 1.4.1-1 -- Initial import (rhbz#1424825) - -* Sun May 07 2017 Björn Esser - 1.4.1-0.1 -- New upstream release (rhbz#1448442) -- Properly own plugin-dirs - -* Sat May 06 2017 Björn Esser - 1.4.0-0.1 -- New upstream release (rhbz#1448442) - -* Tue Feb 21 2017 Björn Esser - 1.2.2-0.3 -- Initial import (rhbz#1424825) -- Bootstrap-build for xviewer-plugins - -* Sun Feb 19 2017 Björn Esser - 1.2.2-0.2 -- Fix dir-ownership for %%{_datadir}/help - -* Sun Feb 19 2017 Björn Esser - 1.2.2-0.1 -- Initial rpm-release (rhbz#1424825)