From 2cf1cdae2e5d9f81c6097c86ebc81efae22ccd42 Mon Sep 17 00:00:00 2001 From: Björn Esser Date: May 24 2017 09:18:55 +0000 Subject: New upstream release (rhbz#1454986) --- diff --git a/sources b/sources index 263e7fe..ba08b03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-1.4.1.tar.gz) = 23b51756e3d106a7ff340bea24775d6545cc23124b0ec99a1430ec1aeba37bb36cbd99858372be02adcad3feb6a2435305554e0ab47c94a8a50c7b64cecaeb31 +SHA512 (xreader-1.4.2.tar.gz) = cee03753077e1a2b13dfbeefbc9ae22d0899423e4b32aebbe50a9b450b589f9440a5ba0324d5ab611e6c36ad9443888e1c2857ff96e2b3055946b9d5dd1a05cc diff --git a/xreader-1.4.1-fix_build_without_caja.patch b/xreader-1.4.1-fix_build_without_caja.patch deleted file mode 100644 index bfe6fbb..0000000 --- a/xreader-1.4.1-fix_build_without_caja.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 423b608d2892dec4a08a2e7956b1ad0c95313006 Mon Sep 17 00:00:00 2001 -From: Alexei Sorokin -Date: Mon, 8 May 2017 15:04:14 +0300 -Subject: [PATCH] Fix gtk-doc with no Caja or no Nemo extension building - ---- - help/reference/shell/Makefile.am | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am -index 7f4fde6..b9e7b27 100644 ---- a/help/reference/shell/Makefile.am -+++ b/help/reference/shell/Makefile.am -@@ -97,8 +97,6 @@ GTKDOC_CFLAGS = \ - -I$(top_srcdir)/libview \ - -I$(top_srcdir)/libmisc \ - -I$(top_builddir)/libview \ -- -I$(top_srcdir)/properties-caja \ -- -I$(top_srcdir)/properties-nemo \ - -DXREADERDATADIR=\"$(pkgdatadir)\" \ - -DMATEDATADIR=\"$(datadir)\" \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ -@@ -118,8 +116,6 @@ GTKDOC_LIBS = \ - $(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la \ - $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \ - $(top_builddir)/cut-n-paste/smclient/libsmclient.la \ -- $(top_builddir)/properties-caja/libevproperties.la \ -- $(top_builddir)/properties-nemo/libevproperties.la \ - $(top_builddir)/libdocument/libxreaderdocument.la \ - $(top_builddir)/libview/libxreaderview.la \ - $(top_builddir)/libmisc/libevmisc.la \ -@@ -128,6 +124,16 @@ GTKDOC_LIBS = \ - $(MATE_DESKTOP_LIBS) \ - $(filter-out $(FILTER_OUT),$(wildcard $(top_builddir)/shell/*.o)) - -+if ENABLE_CAJA -+ GTKDOC_CFLAGS+=-I$(top_srcdir)/properties-caja -+ GTKDOC_LIBS+=$(top_builddir)/properties-caja/libevproperties.la -+endif -+ -+if ENABLE_NEMO -+ GTKDOC_CFLAGS+=-I$(top_srcdir)/properties-nemo -+ GTKDOC_LIBS+=$(top_builddir)/properties-nemo/libevproperties.la -+endif -+ - # This includes the standard gtk-doc make rules, copied by gtkdocize. - include $(top_srcdir)/gtk-doc.make - diff --git a/xreader.spec b/xreader.spec index d277328..d0a35e8 100644 --- a/xreader.spec +++ b/xreader.spec @@ -10,17 +10,14 @@ Name: xreader -Version: 1.4.1 -Release: 2%{?dist} +Version: 1.4.2 +Release: 1%{?dist} Summary: Simple document viewer License: GPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# Patches from upstream. -Patch0: %{url}/pull/133.patch#/%{name}-1.4.1-fix_build_without_caja.patch - BuildRequires: gnome-common BuildRequires: gtk-doc BuildRequires: intltool @@ -231,6 +228,9 @@ fi %changelog +* Wed May 24 2017 Björn Esser - 1.4.2-1 +- New upstream release (rhbz#1454986) + * Mon May 08 2017 Björn Esser - 1.4.1-2 - Add patch to fix build without Caja-extension