From a6c383d2cb45e8d8f16de18f9c7e563e93f8c318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 8 May 2017 14:58:05 +0200 Subject: [PATCH 01/59] Initial import (rhbz#1424832) --- .gitignore | 4 + sources | 1 + xreader.spec | 219 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 224 insertions(+) create mode 100644 xreader.spec diff --git a/.gitignore b/.gitignore index e69de29..4a406bf 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,4 @@ +*~ +*.rpm +*.tar* +results_*/ diff --git a/sources b/sources index e69de29..43f4e4a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (xreader-1.4.0.tar.gz) = 40c12f1a61ebcfdabf3859fa37c156b24c75b83f653247bda05138ffe97491789c1a59a65ffead159d43081d4d8f5d54d1c6b0561d3524f44765172b57686a47 diff --git a/xreader.spec b/xreader.spec new file mode 100644 index 0000000..8a017d3 --- /dev/null +++ b/xreader.spec @@ -0,0 +1,219 @@ +# Filter provides from plugins. +%global __provides_exclude_from ^%{_libdir}/%{name}/.*$ + + +Name: xreader +Version: 1.4.0 +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 + +BuildRequires: gnome-common +BuildRequires: gtk-doc +BuildRequires: intltool +BuildRequires: itstool +BuildRequires: libappstream-glib +BuildRequires: pkgconfig(ddjvuapi) +BuildRequires: pkgconfig(gail-3.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk+-unix-print-3.0) +BuildRequires: pkgconfig(kpathsea) +BuildRequires: pkgconfig(libcaja-extension) +BuildRequires: pkgconfig(libgxps) +BuildRequires: pkgconfig(libnemo-extension) +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(libspectre) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(poppler-glib) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(webkit2gtk-4.0) +BuildRequires: texlive +BuildRequires: yelp-tools + +Requires: shared-mime-info%{?_isa} +Requires: gsettings-desktop-schemas%{?_isa} +Requires: xapps%{?_isa} + +Recommends: yelp%{?_isa} + +%if (0%{?fedora} && 0%{?fedora} <=24) || (0%{?rhel} && 0%{?rhel} <= 7) +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils +%endif (0%%{?fedora} && 0%%{?fedora} <=24) || (0%%{?rhel} && 0%%{?rhel} <= 7) + +%description +X-Apps Document Reader is a document viewer capable of displaying +multiple and singlepage document formats like PDF and PostScript. + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} == %{version}-%{release} + +%description devel +This package contains the development files for %{name}. + + +%package doc +Summary: Documentation files for %{name} + +BuildArch: noarch + +%description doc +This package contains the documentation files for %{name}. + + +%package -n nemo-extension-%{name} +Summary: X-Apps Document Reader file manager extension + +Requires: nemo +Requires: %{name}%{?_isa} == %{version}-%{release} + +%description -n nemo-extension-%{name} +X-Apps Document Reader is a document viewer capable of displaying +multiple and singlepage document formats like PDF and PostScript. + +This package contains the xreader extension for the +Nemo file manager. +It adds an additional tab called "Document" to the file properties +dialog. + + +%package -n caja-extension-%{name} +Summary: X-Apps Document Reader file manager extension + +Requires: caja +Requires: %{name}%{?_isa} == %{version}-%{release} + +%description -n caja-extension-%{name} +X-Apps Document Reader is a document viewer capable of displaying +multiple and singlepage document formats like PDF and PostScript. + +This package contains the xreader extension for the +Caja file manager. +It adds an additional tab called "Document" to the file properties +dialog. + + +%prep +%autosetup -p 1 +NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh + + +%build +export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" +%configure \ + --disable-silent-rules \ + --disable-static \ + --enable-gtk-doc \ + --enable-introspection \ + --enable-pixbuf + +%make_build + + +%install +%make_install +%{_bindir}/find %{buildroot} -type f -name '*.a' -print -delete +%{_bindir}/find %{buildroot} -type f -name '*.la' -print -delete +%{__sed} -i -e '/.*.*/d' \ + %{buildroot}%{_datadir}/appdata/*.appdata.xml +%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 + + +%post +/sbin/ldconfig +/bin/touch %{_datadir}/icons/hicolor >&/dev/null || : +%if (0%{?fedora} && 0%{?fedora} <=24) || (0%{?rhel} && 0%{?rhel} <= 7) +%{_bindir}/update-desktop-database &> /dev/null || : +%endif (0%%{?fedora} && 0%%{?fedora} <=24) || (0%%{?rhel} && 0%%{?rhel} <= 7) + +%postun +/sbin/ldconfig +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 || : +%endif (0%%{?fedora} && 0%%{?fedora} <=24) || (0%%{?rhel} && 0%%{?rhel} <= 7) + +%posttrans +%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : + + +%files -f %{name}.lang +%license AUTHORS COPYING debian/copyright +%doc ChangeLog README debian/changelog +%{_bindir}/%{name}* +%{_datadir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/dbus-1/services/* +%{_datadir}/glib-2.0/schemas/* +%{_datadir}/help/*/%{name} +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/thumbnailers/%{name}.thumbnailer +%{_libdir}/girepository-1.0/* +%{_libdir}/*.so.* +%{_libdir}/%{name} +%{_libexecdir}/%{name}* +%{_mandir}/man?/*.* + + +%files devel +%{_datadir}/gir-1.0/* +%{_includedir}/%{name} +%{_libdir}/*.so +%{_libdir}/pkgconfig/xreader-document-1.5.0.pc +%{_libdir}/pkgconfig/xreader-view-1.5.0.pc + + +%files doc +%license %{_datadir}/licenses/%{name} +%doc %{_datadir}/doc/%{name} +%{_datadir}/gtk-doc + + +%files -n nemo-extension-%{name} +# This directory is not owned by any other package, +# maybe should be added to the nemo package +%dir %{_datadir}/nemo/extensions/ +%{_datadir}/nemo/extensions/libxreader-properties-page.nemo-extension +%{_libdir}/nemo/extensions-3.0/libxreader-properties-page.so + + +%files -n caja-extension-%{name} +# This directory is not owned by any other package, +# maybe should be added to the caja package +%dir %{_datadir}/caja/extensions/ +%{_datadir}/caja/extensions/libxreader-properties-page.caja-extension +%{_libdir}/caja/extensions-2.0/libxreader-properties-page.so + + +%changelog +* Mon May 08 2017 Björn Esser - 1.4.0-1 +- Initial import (rhbz#1424832) + +* Sat May 06 2017 Björn Esser - 1.4.0-0.1 +- Initial rpm-release (rhbz#1424832) From c64ab4cec0e0f800e4f59f0ac417d46f7f24ddb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 8 May 2017 15:58:17 +0200 Subject: [PATCH 02/59] Disable Caja-extension for Fedora <= 25 --- xreader.spec | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index 8a017d3..4acad83 100644 --- a/xreader.spec +++ b/xreader.spec @@ -1,10 +1,17 @@ # Filter provides from plugins. %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ +# Caja in Fedora <= 25 is to old for the extension. +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 +%global caja_ext 1 +%else # 0%%{?fedora} >= 26 || 0%%{?rhel} >= 8 +%global caja_ext 0 +%endif # 0%%{?fedora} >= 26 || 0%%{?rhel} >= 8 + Name: xreader Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -26,7 +33,9 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-unix-print-3.0) BuildRequires: pkgconfig(kpathsea) +%if 0%{?caja_ext} BuildRequires: pkgconfig(libcaja-extension) +%endif # 0%%{?caja_ext} BuildRequires: pkgconfig(libgxps) BuildRequires: pkgconfig(libnemo-extension) BuildRequires: pkgconfig(libsecret-1) @@ -89,6 +98,7 @@ It adds an additional tab called "Document" to the file properties dialog. +%if 0%{?caja_ext} %package -n caja-extension-%{name} Summary: X-Apps Document Reader file manager extension @@ -103,6 +113,7 @@ This package contains the xreader extension for the Caja file manager. It adds an additional tab called "Document" to the file properties dialog. +%endif # 0%%{?caja_ext} %prep @@ -115,6 +126,9 @@ export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" %configure \ --disable-silent-rules \ --disable-static \ +%if 0%{?caja_ext} == 0 + --disable-caja \ +%endif # 0%%{?caja_ext} == 0 --enable-gtk-doc \ --enable-introspection \ --enable-pixbuf @@ -203,15 +217,20 @@ fi %{_libdir}/nemo/extensions-3.0/libxreader-properties-page.so +%if 0%{?caja_ext} %files -n caja-extension-%{name} # This directory is not owned by any other package, # maybe should be added to the caja package %dir %{_datadir}/caja/extensions/ %{_datadir}/caja/extensions/libxreader-properties-page.caja-extension %{_libdir}/caja/extensions-2.0/libxreader-properties-page.so +%endif # 0%%{?caja_ext} %changelog +* Mon May 08 2017 Björn Esser - 1.4.0-2 +- Disable Caja-extension for Fedora <= 25 + * Mon May 08 2017 Björn Esser - 1.4.0-1 - Initial import (rhbz#1424832) From 0f737942657efdaa1cff512dc78563493a562df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 8 May 2017 18:34:54 +0200 Subject: [PATCH 03/59] New upstream release (rhbz#1448921) --- sources | 2 +- xreader.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 43f4e4a..263e7fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-1.4.0.tar.gz) = 40c12f1a61ebcfdabf3859fa37c156b24c75b83f653247bda05138ffe97491789c1a59a65ffead159d43081d4d8f5d54d1c6b0561d3524f44765172b57686a47 +SHA512 (xreader-1.4.1.tar.gz) = 23b51756e3d106a7ff340bea24775d6545cc23124b0ec99a1430ec1aeba37bb36cbd99858372be02adcad3feb6a2435305554e0ab47c94a8a50c7b64cecaeb31 diff --git a/xreader.spec b/xreader.spec index 4acad83..2304314 100644 --- a/xreader.spec +++ b/xreader.spec @@ -10,8 +10,8 @@ Name: xreader -Version: 1.4.0 -Release: 2%{?dist} +Version: 1.4.1 +Release: 1%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -228,6 +228,9 @@ fi %changelog +* Mon May 08 2017 Björn Esser - 1.4.1-1 +- New upstream release (rhbz#1448921) + * Mon May 08 2017 Björn Esser - 1.4.0-2 - Disable Caja-extension for Fedora <= 25 From bb1943543ea40b14147539ec19af60559ebbd1e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 8 May 2017 21:13:08 +0200 Subject: [PATCH 04/59] Add patch to fix build without Caja-extension --- xreader-1.4.1-fix_build_without_caja.patch | 48 ++++++++++++++++++++++ xreader.spec | 8 +++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 xreader-1.4.1-fix_build_without_caja.patch diff --git a/xreader-1.4.1-fix_build_without_caja.patch b/xreader-1.4.1-fix_build_without_caja.patch new file mode 100644 index 0000000..bfe6fbb --- /dev/null +++ b/xreader-1.4.1-fix_build_without_caja.patch @@ -0,0 +1,48 @@ +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 2304314..d277328 100644 --- a/xreader.spec +++ b/xreader.spec @@ -11,13 +11,16 @@ Name: xreader Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -228,6 +231,9 @@ fi %changelog +* Mon May 08 2017 Björn Esser - 1.4.1-2 +- Add patch to fix build without Caja-extension + * Mon May 08 2017 Björn Esser - 1.4.1-1 - New upstream release (rhbz#1448921) From 2cf1cdae2e5d9f81c6097c86ebc81efae22ccd42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 24 May 2017 11:18:55 +0200 Subject: [PATCH 05/59] New upstream release (rhbz#1454986) --- sources | 2 +- xreader-1.4.1-fix_build_without_caja.patch | 48 ---------------------- xreader.spec | 10 ++--- 3 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 xreader-1.4.1-fix_build_without_caja.patch 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 From c621da8dd68484d2e79a7cd85491d3f187f1f25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 28 Jun 2017 15:34:03 +0200 Subject: [PATCH 06/59] New upstream release (rhbz#1462726) --- .gitignore | 1 + sources | 2 +- xreader.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4a406bf..e372e8e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.rpm *.tar* results_*/ +/xreader.spec diff --git a/sources b/sources index ba08b03..a4904a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-1.4.2.tar.gz) = cee03753077e1a2b13dfbeefbc9ae22d0899423e4b32aebbe50a9b450b589f9440a5ba0324d5ab611e6c36ad9443888e1c2857ff96e2b3055946b9d5dd1a05cc +SHA512 (xreader.spec) = 3f8127fb5aea7ae03982b9c97000389f2df7de0a84597146b94ede7dc5de10079ce435bc23083bbe2e7fc6f695da54bbf1c8b7574e1c141792d61770e32c739c diff --git a/xreader.spec b/xreader.spec index d0a35e8..1f8309b 100644 --- a/xreader.spec +++ b/xreader.spec @@ -10,7 +10,7 @@ Name: xreader -Version: 1.4.2 +Version: 1.4.4 Release: 1%{?dist} Summary: Simple document viewer @@ -228,6 +228,9 @@ fi %changelog +* Wed Jun 28 2017 Björn Esser - 1.4.4-1 +- New upstream release (rhbz#1462726) + * Wed May 24 2017 Björn Esser - 1.4.2-1 - New upstream release (rhbz#1454986) From 1cc8d0b0744366e7f43aaf8a84f2b9f5a2958ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 28 Jun 2017 15:47:37 +0200 Subject: [PATCH 07/59] Fix uploaded sources --- .gitignore | 1 - sources | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e372e8e..4a406bf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ *.rpm *.tar* results_*/ -/xreader.spec diff --git a/sources b/sources index a4904a3..36c89ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader.spec) = 3f8127fb5aea7ae03982b9c97000389f2df7de0a84597146b94ede7dc5de10079ce435bc23083bbe2e7fc6f695da54bbf1c8b7574e1c141792d61770e32c739c +SHA512 (xreader-1.4.4.tar.gz) = bbdf2c2933f0563a39aa60ad528fef83d2e194f72a4164513d050995f354fe277fd88e2ee3ef323b1a2d44c8bee6a5da32d265943193907b216823ee98ec76a6 From b63b9e24a2d1b58b1512e9ea2f2f02bbc04d3fea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:26:13 +0000 Subject: [PATCH 08/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xreader.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index 1f8309b..477a14f 100644 --- a/xreader.spec +++ b/xreader.spec @@ -11,7 +11,7 @@ Name: xreader Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -228,6 +228,9 @@ fi %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Jun 28 2017 Björn Esser - 1.4.4-1 - New upstream release (rhbz#1462726) From c133af18afaead64c746e915356ee053a77f37c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:58:16 +0000 Subject: [PATCH 09/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xreader.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index 477a14f..977cded 100644 --- a/xreader.spec +++ b/xreader.spec @@ -11,7 +11,7 @@ Name: xreader Version: 1.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -228,6 +228,9 @@ fi %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.4.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From fd5810770643bf4afe8b5dddcd1b7543ccd4ac18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 1 Sep 2017 15:04:48 +0200 Subject: [PATCH 10/59] Adjustments for EPEL --- xreader.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index 977cded..c56d19b 100644 --- a/xreader.spec +++ b/xreader.spec @@ -11,7 +11,7 @@ Name: xreader Version: 1.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -170,10 +170,16 @@ if [ $1 -eq 0 ]; then 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 || : +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) %files -f %{name}.lang @@ -228,6 +234,9 @@ fi %changelog +* Fri Sep 01 2017 Björn Esser - 1.4.4-4 +- Adjustments for EPEL + * Thu Aug 03 2017 Fedora Release Engineering - 1.4.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From be9f8640397be8a1f1ce8c27044ee472899ecd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 1 Sep 2017 15:24:26 +0200 Subject: [PATCH 11/59] Some more fixes for EPEL --- xreader.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xreader.spec b/xreader.spec index c56d19b..334e4be 100644 --- a/xreader.spec +++ b/xreader.spec @@ -11,7 +11,7 @@ Name: xreader Version: 1.4.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -53,12 +53,13 @@ Requires: shared-mime-info%{?_isa} Requires: gsettings-desktop-schemas%{?_isa} Requires: xapps%{?_isa} +%if 0%{?fedora} || 0%{?rhel} >= 8 Recommends: yelp%{?_isa} - -%if (0%{?fedora} && 0%{?fedora} <=24) || (0%{?rhel} && 0%{?rhel} <= 7) +%else # 0%%{?fedora} || 0%%{?rhel} >= 8 +Requires: yelp%{?_isa} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -%endif (0%%{?fedora} && 0%%{?fedora} <=24) || (0%%{?rhel} && 0%%{?rhel} <= 7) +%endif # 0%%{?fedora} || 0%%{?rhel} >= 8 %description X-Apps Document Reader is a document viewer capable of displaying @@ -234,6 +235,9 @@ fi %changelog +* Fri Sep 01 2017 Björn Esser - 1.4.4-5 +- Some more fixes for EPEL + * Fri Sep 01 2017 Björn Esser - 1.4.4-4 - Adjustments for EPEL From 353021a7a1c06ee93b43d9812de7e85d13f704c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 1 Sep 2017 15:29:55 +0200 Subject: [PATCH 12/59] Some more fixes for EPEL --- xreader.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xreader.spec b/xreader.spec index 334e4be..49a9732 100644 --- a/xreader.spec +++ b/xreader.spec @@ -11,7 +11,7 @@ Name: xreader Version: 1.4.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -211,8 +211,8 @@ fi %files doc -%license %{_datadir}/licenses/%{name} -%doc %{_datadir}/doc/%{name} +%license %{_datadir}/licenses/%{name}* +%doc %{_datadir}/doc/%{name}* %{_datadir}/gtk-doc @@ -235,6 +235,9 @@ fi %changelog +* Fri Sep 01 2017 Björn Esser - 1.4.4-6 +- Some more fixes for EPEL + * Fri Sep 01 2017 Björn Esser - 1.4.4-5 - Some more fixes for EPEL From 27094b315452f92370de53739695206528518579 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 4 Nov 2017 07:20:44 +0000 Subject: [PATCH 13/59] Update to 1.6.0 release --- sources | 2 +- xreader.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 36c89ec..0b93adf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-1.4.4.tar.gz) = bbdf2c2933f0563a39aa60ad528fef83d2e194f72a4164513d050995f354fe277fd88e2ee3ef323b1a2d44c8bee6a5da32d265943193907b216823ee98ec76a6 +SHA512 (xreader-1.6.0.tar.gz) = 9ac1bc40a94efefdcb0f4ca3eb3256a62635e606a055b4dc6ca234d9ad2b8173b1f3c88e7e9d78b39e86ba5986178be174d40e2861ee710a3d0c4cb44ad9eead diff --git a/xreader.spec b/xreader.spec index 49a9732..070d12b 100644 --- a/xreader.spec +++ b/xreader.spec @@ -10,8 +10,8 @@ Name: xreader -Version: 1.4.4 -Release: 6%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -235,6 +235,9 @@ fi %changelog +* Sat Nov 04 2017 Leigh Scott - 1.6.0-1 +- Update to 1.6.0 release + * Fri Sep 01 2017 Björn Esser - 1.4.4-6 - Some more fixes for EPEL From b1781d14ce398652f878633db41570322eea983a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 16 Nov 2017 22:46:22 +0100 Subject: [PATCH 14/59] Bootstrapping on EPEL7 --- xreader.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index 070d12b..2525a36 100644 --- a/xreader.spec +++ b/xreader.spec @@ -11,7 +11,7 @@ Name: xreader Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -32,7 +32,11 @@ BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-unix-print-3.0) +%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: pkgconfig(kpathsea) +%else +BuildRequires: texlive-kpathsea-lib-devel +%endif %if 0%{?caja_ext} BuildRequires: pkgconfig(libcaja-extension) %endif # 0%%{?caja_ext} @@ -235,6 +239,9 @@ fi %changelog +* 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 From 36f6262126df9e0d6834fbda71e054213be6331b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 16 Nov 2017 22:48:13 +0100 Subject: [PATCH 15/59] Redistributable build on EPEL7 --- xreader.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index 2525a36..aa7eb0b 100644 --- a/xreader.spec +++ b/xreader.spec @@ -11,7 +11,7 @@ Name: xreader Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -239,6 +239,9 @@ fi %changelog +* 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 From 79bb08997c621afc1acb5ffe878cae3a3d2f4b67 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 12 Dec 2017 08:51:02 +0000 Subject: [PATCH 16/59] New upstream release --- sources | 2 +- use_major_only.patch | 26 ++++++++++++++++++++++++++ xreader.spec | 13 +++++++++---- 3 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 use_major_only.patch diff --git a/sources b/sources index 0b93adf..8da4c79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-1.6.0.tar.gz) = 9ac1bc40a94efefdcb0f4ca3eb3256a62635e606a055b4dc6ca234d9ad2b8173b1f3c88e7e9d78b39e86ba5986178be174d40e2861ee710a3d0c4cb44ad9eead +SHA512 (xreader-1.6.1.tar.gz) = d750b2af2c9540c91d3906a8ee72bde8d9d68d6810fce2dd398c32108fcf6c3932172206cf5a01c99277f1ebefd7053a41ad3ca9cc1b1bdb0eadff21b00e68de diff --git a/use_major_only.patch b/use_major_only.patch new file mode 100644 index 0000000..5d87c52 --- /dev/null +++ b/use_major_only.patch @@ -0,0 +1,26 @@ +From 7ed343858f32a26b64b0cfab66a844a1c6590e38 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Mon, 11 Dec 2017 22:43:33 -0500 +Subject: [PATCH] configure.ac: Use major.minor version only for API, this + breaks loading of introspection otherwise, which seems to expect only + *-1.5.typelib. + +The only user of this currently is nemo-preview (which will need to be +rebuilt.) +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b15722b..fdd47bc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,7 +9,7 @@ m4_define([ev_extra_version], []) + m4_define([ev_version], [ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version]) + + # The xreader API version +-m4_define([ev_api_version], [1.5.0]) ++m4_define([ev_api_version], [1.5]) + + # Libtool versioning. The backend and view libraries have separate versions. + # Before making a release, the libtool version should be modified. diff --git a/xreader.spec b/xreader.spec index aa7eb0b..43cdc93 100644 --- a/xreader.spec +++ b/xreader.spec @@ -10,13 +10,14 @@ Name: xreader -Version: 1.6.0 -Release: 3%{?dist} +Version: 1.6.1 +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 +Patch0: %{url}/commit/7ed343858f32a26b64b0cfab66a844a1c6590e38.patch#/use_major_only.patch BuildRequires: gnome-common BuildRequires: gtk-doc @@ -210,8 +211,8 @@ fi %{_datadir}/gir-1.0/* %{_includedir}/%{name} %{_libdir}/*.so -%{_libdir}/pkgconfig/xreader-document-1.5.0.pc -%{_libdir}/pkgconfig/xreader-view-1.5.0.pc +%{_libdir}/pkgconfig/xreader-document-1.5.pc +%{_libdir}/pkgconfig/xreader-view-1.5.pc %files doc @@ -239,6 +240,10 @@ fi %changelog +* Tue Dec 12 2017 Leigh Scott - 1.6.1-1 +- New upstream release +- Fix typelib version + * Thu Nov 16 2017 Björn Esser - 1.6.0-3 - Redistributable build on EPEL7 From e346289f9830f53ee0a9cea647577135482372b9 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 18 Dec 2017 13:33:29 +0000 Subject: [PATCH 17/59] New upstream release --- sources | 2 +- use_major_only.patch | 26 -------------------------- xreader.spec | 6 ++++-- 3 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 use_major_only.patch diff --git a/sources b/sources index 8da4c79..5cccc82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-1.6.1.tar.gz) = d750b2af2c9540c91d3906a8ee72bde8d9d68d6810fce2dd398c32108fcf6c3932172206cf5a01c99277f1ebefd7053a41ad3ca9cc1b1bdb0eadff21b00e68de +SHA512 (xreader-1.6.2.tar.gz) = f32d8113a93a82da51e711c983ba0a720edc012f14b977adb0227b1531cb0ae1a6ab3809c4199233ed9b6d185cdfc038af55f68bec1d2ac252d9bb1859209a0c diff --git a/use_major_only.patch b/use_major_only.patch deleted file mode 100644 index 5d87c52..0000000 --- a/use_major_only.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7ed343858f32a26b64b0cfab66a844a1c6590e38 Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Mon, 11 Dec 2017 22:43:33 -0500 -Subject: [PATCH] configure.ac: Use major.minor version only for API, this - breaks loading of introspection otherwise, which seems to expect only - *-1.5.typelib. - -The only user of this currently is nemo-preview (which will need to be -rebuilt.) ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index b15722b..fdd47bc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9,7 +9,7 @@ m4_define([ev_extra_version], []) - m4_define([ev_version], [ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version]) - - # The xreader API version --m4_define([ev_api_version], [1.5.0]) -+m4_define([ev_api_version], [1.5]) - - # Libtool versioning. The backend and view libraries have separate versions. - # Before making a release, the libtool version should be modified. diff --git a/xreader.spec b/xreader.spec index 43cdc93..9b7336e 100644 --- a/xreader.spec +++ b/xreader.spec @@ -10,14 +10,13 @@ Name: xreader -Version: 1.6.1 +Version: 1.6.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 -Patch0: %{url}/commit/7ed343858f32a26b64b0cfab66a844a1c6590e38.patch#/use_major_only.patch BuildRequires: gnome-common BuildRequires: gtk-doc @@ -240,6 +239,9 @@ fi %changelog +* Mon Dec 18 2017 Leigh Scott - 1.6.2-1 +- New upstream release + * Tue Dec 12 2017 Leigh Scott - 1.6.1-1 - New upstream release - Fix typelib version From 6f7c9e1482f8bdb2fdc24bd56a11dd1bd1cd3e7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:04:21 +0000 Subject: [PATCH 18/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xreader.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index 9b7336e..a5b48fd 100644 --- a/xreader.spec +++ b/xreader.spec @@ -11,7 +11,7 @@ Name: xreader Version: 1.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -239,6 +239,9 @@ fi %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Dec 18 2017 Leigh Scott - 1.6.2-1 - New upstream release From d6d9b1734522bd30007c53b6b063e629d0b120ed Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 10 May 2018 08:44:51 +0100 Subject: [PATCH 19/59] Update to 1.8.1 release --- sources | 2 +- xreader.spec | 117 ++++++++++++--------------------------------------- 2 files changed, 28 insertions(+), 91 deletions(-) diff --git a/sources b/sources index 5cccc82..c957333 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-1.6.2.tar.gz) = f32d8113a93a82da51e711c983ba0a720edc012f14b977adb0227b1531cb0ae1a6ab3809c4199233ed9b6d185cdfc038af55f68bec1d2ac252d9bb1859209a0c +SHA512 (xreader-1.8.1.tar.gz) = 78c0ba940a705781d42f6c0a55581f0a90c237d86c9bc091f6c3d8b8f71253e180c2ad2bfc828f0d0bf389cb3064b437efd2e53435215cf25728aa0bc2396365 diff --git a/xreader.spec b/xreader.spec index a5b48fd..aa76361 100644 --- a/xreader.spec +++ b/xreader.spec @@ -1,17 +1,9 @@ # Filter provides from plugins. %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ -# Caja in Fedora <= 25 is to old for the extension. -%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 -%global caja_ext 1 -%else # 0%%{?fedora} >= 26 || 0%%{?rhel} >= 8 -%global caja_ext 0 -%endif # 0%%{?fedora} >= 26 || 0%%{?rhel} >= 8 - - Name: xreader -Version: 1.6.2 -Release: 2%{?dist} +Version: 1.8.1 +Release: 1%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -37,17 +29,14 @@ BuildRequires: pkgconfig(kpathsea) %else BuildRequires: texlive-kpathsea-lib-devel %endif -%if 0%{?caja_ext} -BuildRequires: pkgconfig(libcaja-extension) -%endif # 0%%{?caja_ext} BuildRequires: pkgconfig(libgxps) -BuildRequires: pkgconfig(libnemo-extension) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libspectre) BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(xapp) >= 1.2.0 BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: texlive @@ -65,6 +54,9 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils %endif # 0%%{?fedora} || 0%%{?rhel} >= 8 +Obsoletes: nemo-extension-%{name} < %{version}-%{release} +Obsoletes: caja-extension-%{name} < %{version}-%{release} + %description X-Apps Document Reader is a document viewer capable of displaying multiple and singlepage document formats like PDF and PostScript. @@ -72,7 +64,7 @@ multiple and singlepage document formats like PDF and PostScript. %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 for %{name}. @@ -87,55 +79,18 @@ BuildArch: noarch This package contains the documentation files for %{name}. -%package -n nemo-extension-%{name} -Summary: X-Apps Document Reader file manager extension - -Requires: nemo -Requires: %{name}%{?_isa} == %{version}-%{release} - -%description -n nemo-extension-%{name} -X-Apps Document Reader is a document viewer capable of displaying -multiple and singlepage document formats like PDF and PostScript. - -This package contains the xreader extension for the -Nemo file manager. -It adds an additional tab called "Document" to the file properties -dialog. - - -%if 0%{?caja_ext} -%package -n caja-extension-%{name} -Summary: X-Apps Document Reader file manager extension - -Requires: caja -Requires: %{name}%{?_isa} == %{version}-%{release} - -%description -n caja-extension-%{name} -X-Apps Document Reader is a document viewer capable of displaying -multiple and singlepage document formats like PDF and PostScript. - -This package contains the xreader extension for the -Caja file manager. -It adds an additional tab called "Document" to the file properties -dialog. -%endif # 0%%{?caja_ext} - - %prep -%autosetup -p 1 +%autosetup -p1 NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %build export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" -%configure \ - --disable-silent-rules \ - --disable-static \ -%if 0%{?caja_ext} == 0 - --disable-caja \ -%endif # 0%%{?caja_ext} == 0 - --enable-gtk-doc \ - --enable-introspection \ +%configure \ + --disable-silent-rules \ + --disable-static \ + --enable-gtk-doc \ + --enable-introspection \ --enable-pixbuf %make_build @@ -145,27 +100,25 @@ export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" %make_install %{_bindir}/find %{buildroot} -type f -name '*.a' -print -delete %{_bindir}/find %{buildroot} -type f -name '*.la' -print -delete -%{__sed} -i -e '/.*.*/d' \ +%{__sed} -i -e '/.*.*/d' \ %{buildroot}%{_datadir}/appdata/*.appdata.xml %find_lang %{name} %check # Validate desktop-files. -%{_bindir}/desktop-file-validate \ +%{_bindir}/desktop-file-validate \ %{buildroot}%{_datadir}/applications/*.desktop # Validate AppData-files. -%{_bindir}/appstream-util validate-relax --nonet \ +%{_bindir}/appstream-util validate-relax --nonet \ %{buildroot}%{_datadir}/appdata/*.appdata.xml - +%if (0%{?rhel} && 0%{?rhel <= 7}) %post /sbin/ldconfig /bin/touch %{_datadir}/icons/hicolor >&/dev/null || : -%if (0%{?fedora} && 0%{?fedora} <=24) || (0%{?rhel} && 0%{?rhel} <= 7) %{_bindir}/update-desktop-database &> /dev/null || : -%endif (0%%{?fedora} && 0%%{?fedora} <=24) || (0%%{?rhel} && 0%%{?rhel} <= 7) %postun /sbin/ldconfig @@ -173,42 +126,41 @@ 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 || : 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) +%else # (0%%{?rhel} && 0%%{?rhel <= 7}) +%ldconfig_scriptlets +%endif # (0%%{?rhel} && 0%%{?rhel <= 7}) %files -f %{name}.lang %license AUTHORS COPYING debian/copyright %doc ChangeLog README debian/changelog %{_bindir}/%{name}* -%{_datadir}/%{name} +%{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/dbus-1/services/* %{_datadir}/glib-2.0/schemas/* -%{_datadir}/help/*/%{name} +%{_datadir}/help/*/%{name}/ %{_datadir}/icons/hicolor/*/*/* %{_datadir}/thumbnailers/%{name}.thumbnailer %{_libdir}/girepository-1.0/* %{_libdir}/*.so.* -%{_libdir}/%{name} +%{_libdir}/%{name}/ %{_libexecdir}/%{name}* %{_mandir}/man?/*.* %files devel %{_datadir}/gir-1.0/* -%{_includedir}/%{name} +%{_includedir}/%{name}/ %{_libdir}/*.so %{_libdir}/pkgconfig/xreader-document-1.5.pc %{_libdir}/pkgconfig/xreader-view-1.5.pc @@ -220,25 +172,10 @@ fi %{_datadir}/gtk-doc -%files -n nemo-extension-%{name} -# This directory is not owned by any other package, -# maybe should be added to the nemo package -%dir %{_datadir}/nemo/extensions/ -%{_datadir}/nemo/extensions/libxreader-properties-page.nemo-extension -%{_libdir}/nemo/extensions-3.0/libxreader-properties-page.so - - -%if 0%{?caja_ext} -%files -n caja-extension-%{name} -# This directory is not owned by any other package, -# maybe should be added to the caja package -%dir %{_datadir}/caja/extensions/ -%{_datadir}/caja/extensions/libxreader-properties-page.caja-extension -%{_libdir}/caja/extensions-2.0/libxreader-properties-page.so -%endif # 0%%{?caja_ext} - - %changelog +* Thu May 10 2018 Leigh Scott - 1.8.1-1 +- Update to 1.8.1 release + * Fri Feb 09 2018 Fedora Release Engineering - 1.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 56448935b9951f95af99b8b9726e6ad7a11c2ed5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:34:26 +0000 Subject: [PATCH 20/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xreader.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index aa76361..696dabd 100644 --- a/xreader.spec +++ b/xreader.spec @@ -3,7 +3,7 @@ Name: xreader Version: 1.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -173,6 +173,9 @@ fi %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu May 10 2018 Leigh Scott - 1.8.1-1 - Update to 1.8.1 release From 0196de617f2f3ede757f6e13c9a9e66024da15ef Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 16 Jul 2018 17:01:55 +0100 Subject: [PATCH 21/59] Update to 1.8.4 release --- sources | 2 +- xreader.spec | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sources b/sources index c957333..d83babc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-1.8.1.tar.gz) = 78c0ba940a705781d42f6c0a55581f0a90c237d86c9bc091f6c3d8b8f71253e180c2ad2bfc828f0d0bf389cb3064b437efd2e53435215cf25728aa0bc2396365 +SHA512 (xreader-1.8.4.tar.gz) = 6ea3a6d76a1005f996a0c77031e63dd99192d16fe08dfb020ced4cdd838960e6f56a3ed5739924b6c4df30801849b3b9d408995e2dd714ee25ebafa37369d8bb diff --git a/xreader.spec b/xreader.spec index 696dabd..852c630 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,14 +2,15 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 1.8.1 -Release: 2%{?dist} +Version: 1.8.4 +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 +BuildRequires: gcc-c++ BuildRequires: gnome-common BuildRequires: gtk-doc BuildRequires: intltool @@ -173,6 +174,10 @@ fi %changelog +* Mon Jul 16 2018 Leigh Scott - 1.8.4-1 +- Update to 1.8.4 release +- Add BuildRequires gcc-c++ + * Sat Jul 14 2018 Fedora Release Engineering - 1.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 721274f11fe8e05fe86060769b72f4c6b288b8a3 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 15 Aug 2018 08:38:39 +0100 Subject: [PATCH 22/59] Update to 1.8.5 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d83babc..d233846 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-1.8.4.tar.gz) = 6ea3a6d76a1005f996a0c77031e63dd99192d16fe08dfb020ced4cdd838960e6f56a3ed5739924b6c4df30801849b3b9d408995e2dd714ee25ebafa37369d8bb +SHA512 (xreader-1.8.5.tar.gz) = 3b185fd993d1a94a50ef29867ca56ef3c692d25d07b267fe34d362bc2f58bf7d95fb699423137fe688af734407da27e144c89559c7af23d053f112189ef33599 diff --git a/xreader.spec b/xreader.spec index 852c630..83fecd3 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 1.8.4 +Version: 1.8.5 Release: 1%{?dist} Summary: Simple document viewer @@ -174,6 +174,9 @@ fi %changelog +* Wed Aug 15 2018 Leigh Scott - 1.8.5-1 +- Update to 1.8.5 release + * Mon Jul 16 2018 Leigh Scott - 1.8.4-1 - Update to 1.8.4 release - Add BuildRequires gcc-c++ From 2b5a6e947a067de8aac506aa8490f38f99325c80 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 19 Nov 2018 12:31:57 +0000 Subject: [PATCH 23/59] Update to 2.0.0 release --- sources | 2 +- xreader.spec | 62 ++++++++++++---------------------------------------- 2 files changed, 15 insertions(+), 49 deletions(-) diff --git a/sources b/sources index d233846..616a248 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-1.8.5.tar.gz) = 3b185fd993d1a94a50ef29867ca56ef3c692d25d07b267fe34d362bc2f58bf7d95fb699423137fe688af734407da27e144c89559c7af23d053f112189ef33599 +SHA512 (xreader-2.0.0.tar.gz) = 1966eb610bda122dc0c6460a6274fd031b5dd5b61557f458c0446661481efa52e91e7763b5468cfa1686c69422f158be7c430fb5d84a039e4a91bd24b73e169b diff --git a/xreader.spec b/xreader.spec index 83fecd3..9e0860c 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 1.8.5 +Version: 2.0.0 Release: 1%{?dist} Summary: Simple document viewer @@ -25,11 +25,7 @@ BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-unix-print-3.0) -%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: pkgconfig(kpathsea) -%else -BuildRequires: texlive-kpathsea-lib-devel -%endif BuildRequires: pkgconfig(libgxps) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libspectre) @@ -37,7 +33,7 @@ BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(xapp) >= 1.2.0 +BuildRequires: pkgconfig(xapp) >= 1.4.0 BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: texlive @@ -47,20 +43,11 @@ Requires: shared-mime-info%{?_isa} Requires: gsettings-desktop-schemas%{?_isa} Requires: xapps%{?_isa} -%if 0%{?fedora} || 0%{?rhel} >= 8 Recommends: yelp%{?_isa} -%else # 0%%{?fedora} || 0%%{?rhel} >= 8 -Requires: yelp%{?_isa} -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils -%endif # 0%%{?fedora} || 0%%{?rhel} >= 8 - -Obsoletes: nemo-extension-%{name} < %{version}-%{release} -Obsoletes: caja-extension-%{name} < %{version}-%{release} %description X-Apps Document Reader is a document viewer capable of displaying -multiple and singlepage document formats like PDF and PostScript. +multiple and single page document formats like PDF and PostScript. %package devel @@ -73,7 +60,6 @@ This package contains the development files for %{name}. %package doc Summary: Documentation files for %{name} - BuildArch: noarch %description doc @@ -88,11 +74,11 @@ NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %build export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" %configure \ - --disable-silent-rules \ - --disable-static \ - --enable-gtk-doc \ - --enable-introspection \ - --enable-pixbuf + --disable-silent-rules \ + --disable-static \ + --enable-gtk-doc \ + --enable-introspection \ + --enable-pixbuf %make_build @@ -102,43 +88,20 @@ export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" %{_bindir}/find %{buildroot} -type f -name '*.a' -print -delete %{_bindir}/find %{buildroot} -type f -name '*.la' -print -delete %{__sed} -i -e '/.*.*/d' \ - %{buildroot}%{_datadir}/appdata/*.appdata.xml + %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %find_lang %{name} %check # Validate desktop-files. %{_bindir}/desktop-file-validate \ - %{buildroot}%{_datadir}/applications/*.desktop + %{buildroot}%{_datadir}/applications/%{name}.desktop # Validate AppData-files. %{_bindir}/appstream-util validate-relax --nonet \ - %{buildroot}%{_datadir}/appdata/*.appdata.xml + %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml -%if (0%{?rhel} && 0%{?rhel <= 7}) -%post -/sbin/ldconfig -/bin/touch %{_datadir}/icons/hicolor >&/dev/null || : -%{_bindir}/update-desktop-database &> /dev/null || : - -%postun -/sbin/ldconfig -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 -%{_bindir}/update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -fi - -%posttrans -%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : -%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -%else # (0%%{?rhel} && 0%%{?rhel <= 7}) %ldconfig_scriptlets -%endif # (0%%{?rhel} && 0%%{?rhel <= 7}) - %files -f %{name}.lang %license AUTHORS COPYING debian/copyright @@ -174,6 +137,9 @@ fi %changelog +* Mon Nov 19 2018 Leigh Scott - 2.0.0-1 +- Update to 2.0.0 release + * Wed Aug 15 2018 Leigh Scott - 1.8.5-1 - Update to 1.8.5 release From 00cd8651d12a8005ec646c7bd375baa4745fb87b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 28 Nov 2018 08:01:19 +0000 Subject: [PATCH 24/59] Update to 2.0.1 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 616a248..db2a92d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.0.0.tar.gz) = 1966eb610bda122dc0c6460a6274fd031b5dd5b61557f458c0446661481efa52e91e7763b5468cfa1686c69422f158be7c430fb5d84a039e4a91bd24b73e169b +SHA512 (xreader-2.0.1.tar.gz) = 4ac6ab7311074ce8d4c3f830ceba7bf1c82ece37212b6e085746531a30a3968f2be0bea7fa55965693bc699f07a22496882c1242d740c1c7672040242d2bd9c1 diff --git a/xreader.spec b/xreader.spec index 9e0860c..50ff037 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.0.0 +Version: 2.0.1 Release: 1%{?dist} Summary: Simple document viewer @@ -137,6 +137,9 @@ export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" %changelog +* Wed Nov 28 2018 Leigh Scott - 2.0.1-1 +- Update to 2.0.1 release + * Mon Nov 19 2018 Leigh Scott - 2.0.0-1 - Update to 2.0.0 release From 185051ae3fe1aafeb51fea3650e406c603021933 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 16 Dec 2018 09:44:04 +0000 Subject: [PATCH 25/59] Update to 2.0.2 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index db2a92d..8fb87ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.0.1.tar.gz) = 4ac6ab7311074ce8d4c3f830ceba7bf1c82ece37212b6e085746531a30a3968f2be0bea7fa55965693bc699f07a22496882c1242d740c1c7672040242d2bd9c1 +SHA512 (xreader-2.0.2.tar.gz) = cb54bd7dce7f215e3b3c0feb0c46d1f38982b0539497e53328d055147a86de6fd5527adb286193176dcdf0902310b05e259e524f6e6108d3ad375a9061284b53 diff --git a/xreader.spec b/xreader.spec index 50ff037..bd15523 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.0.1 +Version: 2.0.2 Release: 1%{?dist} Summary: Simple document viewer @@ -137,6 +137,9 @@ export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" %changelog +* Sun Dec 16 2018 Leigh Scott - 2.0.2-1 +- Update to 2.0.2 release + * Wed Nov 28 2018 Leigh Scott - 2.0.1-1 - Update to 2.0.1 release From e83b6a4be0ad3105dcdc6f669e3269a2c5b85196 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:48:27 +0000 Subject: [PATCH 26/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xreader.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index bd15523..c30f014 100644 --- a/xreader.spec +++ b/xreader.spec @@ -3,7 +3,7 @@ Name: xreader Version: 2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -137,6 +137,9 @@ export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Dec 16 2018 Leigh Scott - 2.0.2-1 - Update to 2.0.2 release From d19223c37aa9fc3f897adc0e82cf67240f15e7b9 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 29 Jun 2019 20:01:44 +0100 Subject: [PATCH 27/59] Update to 2.0.0 release --- sources | 2 +- xreader.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 8fb87ae..a2ea3e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.0.2.tar.gz) = cb54bd7dce7f215e3b3c0feb0c46d1f38982b0539497e53328d055147a86de6fd5527adb286193176dcdf0902310b05e259e524f6e6108d3ad375a9061284b53 +SHA512 (xreader-2.2.0.tar.gz) = 528f0dcd3b9be2779550be77a7f834881c24f12be276909327584e06e0572820e10c87b6c071d2aa521da827983b990479a27395de7029dc1a7ad5e5c9b6286d diff --git a/xreader.spec b/xreader.spec index c30f014..858c6dd 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,13 +2,13 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.0.2 -Release: 2%{?dist} +Version: 2.2.0 +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 +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: gnome-common @@ -137,6 +137,9 @@ export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" %changelog +* Sat Jun 29 2019 Leigh Scott - 2.2.0-1 +- Update to 2.0.0 release + * Sun Feb 03 2019 Fedora Release Engineering - 2.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From f393735098448d28d3a9ccfe73f1ff1fdbd14614 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 29 Jun 2019 20:27:13 +0100 Subject: [PATCH 28/59] Switch to meson --- xreader.spec | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/xreader.spec b/xreader.spec index 858c6dd..743f437 100644 --- a/xreader.spec +++ b/xreader.spec @@ -11,7 +11,7 @@ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ -BuildRequires: gnome-common +BuildRequires: meson BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: itstool @@ -72,19 +72,21 @@ NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %build -export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" -%configure \ - --disable-silent-rules \ - --disable-static \ - --enable-gtk-doc \ - --enable-introspection \ - --enable-pixbuf +%meson \ + -Ddeprecated_warnings=false \ + -Ddjvu=true \ + -Ddvi=true \ + -Dt1lib=true \ + -Dpixbuf=true \ + -Dcomics=true \ + -Dintrospection=true \ + -Dhelp_files=true -%make_build +%meson_build %install -%make_install +%meson_install %{_bindir}/find %{buildroot} -type f -name '*.a' -print -delete %{_bindir}/find %{buildroot} -type f -name '*.la' -print -delete %{__sed} -i -e '/.*.*/d' \ @@ -138,7 +140,7 @@ export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" %changelog * Sat Jun 29 2019 Leigh Scott - 2.2.0-1 -- Update to 2.0.0 release +- Update to 2.2.0 release * Sun Feb 03 2019 Fedora Release Engineering - 2.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 60be544f1ed3714f53d1313990af77faf9871547 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 29 Jun 2019 20:32:18 +0100 Subject: [PATCH 29/59] fix --- xreader.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/xreader.spec b/xreader.spec index 743f437..fabeb1c 100644 --- a/xreader.spec +++ b/xreader.spec @@ -68,8 +68,6 @@ This package contains the documentation files for %{name}. %prep %autosetup -p1 -NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh - %build %meson \ @@ -84,7 +82,6 @@ NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %meson_build - %install %meson_install %{_bindir}/find %{buildroot} -type f -name '*.a' -print -delete @@ -93,7 +90,6 @@ NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %find_lang %{name} - %check # Validate desktop-files. %{_bindir}/desktop-file-validate \ @@ -123,7 +119,6 @@ NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %{_libexecdir}/%{name}* %{_mandir}/man?/*.* - %files devel %{_datadir}/gir-1.0/* %{_includedir}/%{name}/ @@ -131,13 +126,11 @@ NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %{_libdir}/pkgconfig/xreader-document-1.5.pc %{_libdir}/pkgconfig/xreader-view-1.5.pc - %files doc %license %{_datadir}/licenses/%{name}* %doc %{_datadir}/doc/%{name}* %{_datadir}/gtk-doc - %changelog * Sat Jun 29 2019 Leigh Scott - 2.2.0-1 - Update to 2.2.0 release From 381da0f24426a17ffdc08ab2f1e53f76ba2135b7 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 29 Jun 2019 22:00:05 +0100 Subject: [PATCH 30/59] fix --- xreader.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xreader.spec b/xreader.spec index fabeb1c..679ce28 100644 --- a/xreader.spec +++ b/xreader.spec @@ -10,8 +10,10 @@ License: GPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: meson +BuildRequires: mathjax BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: itstool @@ -68,6 +70,7 @@ This package contains the documentation files for %{name}. %prep %autosetup -p1 +sed -i -e 's@prefix, libdir@prefix, libexecdir@g' data/meson.build %build %meson \ @@ -84,6 +87,8 @@ This package contains the documentation files for %{name}. %install %meson_install +mkdir %{buildroot}%{_libexecdir}/ +mv %{buildroot}%{_libdir}/xreaderd %{buildroot}%{_libexecdir}/xreaderd %{_bindir}/find %{buildroot} -type f -name '*.a' -print -delete %{_bindir}/find %{buildroot} -type f -name '*.la' -print -delete %{__sed} -i -e '/.*.*/d' \ @@ -116,7 +121,7 @@ This package contains the documentation files for %{name}. %{_libdir}/girepository-1.0/* %{_libdir}/*.so.* %{_libdir}/%{name}/ -%{_libexecdir}/%{name}* +%{_libexecdir}/xreaderd %{_mandir}/man?/*.* %files devel @@ -129,7 +134,6 @@ This package contains the documentation files for %{name}. %files doc %license %{_datadir}/licenses/%{name}* %doc %{_datadir}/doc/%{name}* -%{_datadir}/gtk-doc %changelog * Sat Jun 29 2019 Leigh Scott - 2.2.0-1 From 9bb504f08df5c656025027d72115ff259e5f7c86 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 30 Jun 2019 11:35:04 +0100 Subject: [PATCH 31/59] Update to 2.2.1 release --- sources | 2 +- xreader.spec | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sources b/sources index a2ea3e1..6a85165 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.2.0.tar.gz) = 528f0dcd3b9be2779550be77a7f834881c24f12be276909327584e06e0572820e10c87b6c071d2aa521da827983b990479a27395de7029dc1a7ad5e5c9b6286d +SHA512 (xreader-2.2.1.tar.gz) = 2407d9ccb5b1087b3af5f9d5cc163eaf8e000f0c61bc5bb85f544f4ed34a423d8948bb1424406703da09e7ea7f0fa967e8788e765c504aa85d3e6cb64d3fc343 diff --git a/xreader.spec b/xreader.spec index 679ce28..305885b 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.2.0 +Version: 2.2.1 Release: 1%{?dist} Summary: Simple document viewer @@ -70,7 +70,6 @@ This package contains the documentation files for %{name}. %prep %autosetup -p1 -sed -i -e 's@prefix, libdir@prefix, libexecdir@g' data/meson.build %build %meson \ @@ -87,8 +86,6 @@ sed -i -e 's@prefix, libdir@prefix, libexecdir@g' data/meson.build %install %meson_install -mkdir %{buildroot}%{_libexecdir}/ -mv %{buildroot}%{_libdir}/xreaderd %{buildroot}%{_libexecdir}/xreaderd %{_bindir}/find %{buildroot} -type f -name '*.a' -print -delete %{_bindir}/find %{buildroot} -type f -name '*.la' -print -delete %{__sed} -i -e '/.*.*/d' \ @@ -136,6 +133,9 @@ mv %{buildroot}%{_libdir}/xreaderd %{buildroot}%{_libexecdir}/xreaderd %doc %{_datadir}/doc/%{name}* %changelog +* Sun Jun 30 2019 Leigh Scott - 2.2.1-1 +- Update to 2.2.1 release + * Sat Jun 29 2019 Leigh Scott - 2.2.0-1 - Update to 2.2.0 release From 199f97bcaaa0e9feba9c27a664b0c9396c1b5427 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 14 Jul 2019 08:25:15 +0100 Subject: [PATCH 32/59] Update to 2.2.2 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6a85165..dd3fe25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.2.1.tar.gz) = 2407d9ccb5b1087b3af5f9d5cc163eaf8e000f0c61bc5bb85f544f4ed34a423d8948bb1424406703da09e7ea7f0fa967e8788e765c504aa85d3e6cb64d3fc343 +SHA512 (xreader-2.2.2.tar.gz) = 3ce5a2961ebf08d40ab1d3c7b5570914c206684171a13e7f5eda328d38ccfa553ae51db53dda8fcfd5eba12f610863e2b7f1870660b3c41d5d8bc46ba6f8156f diff --git a/xreader.spec b/xreader.spec index 305885b..f57408a 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.2.1 +Version: 2.2.2 Release: 1%{?dist} Summary: Simple document viewer @@ -133,6 +133,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Sun Jul 14 2019 Leigh Scott - 2.2.2-1 +- Update to 2.2.2 release + * Sun Jun 30 2019 Leigh Scott - 2.2.1-1 - Update to 2.2.1 release From 16ab82909f149209241f2edba397b0b918251b38 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:37:27 +0000 Subject: [PATCH 33/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xreader.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index f57408a..fe16a43 100644 --- a/xreader.spec +++ b/xreader.spec @@ -3,7 +3,7 @@ Name: xreader Version: 2.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -133,6 +133,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Jul 14 2019 Leigh Scott - 2.2.2-1 - Update to 2.2.2 release From f82ec71f273b9e314b4926b61d86f4e55b9fddcd Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 31 Jul 2019 05:58:59 +0100 Subject: [PATCH 34/59] Update to 2.2.3 release --- sources | 2 +- xreader.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index dd3fe25..1e10a11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.2.2.tar.gz) = 3ce5a2961ebf08d40ab1d3c7b5570914c206684171a13e7f5eda328d38ccfa553ae51db53dda8fcfd5eba12f610863e2b7f1870660b3c41d5d8bc46ba6f8156f +SHA512 (xreader-2.2.3.tar.gz) = 97d8a21a5846965fdbfe1aee1d84982f3d94fafb67d5ea7cefc6ea8e515e7de1559a9faf903f5ec4f3882b3742cca9d1a7c8b7e566b8bb0b76029510e4599508 diff --git a/xreader.spec b/xreader.spec index fe16a43..89ee097 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,8 +2,8 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.2.2 -Release: 2%{?dist} +Version: 2.2.3 +Release: 1%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -133,6 +133,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Wed Jul 31 2019 Leigh Scott - 2.2.3-1 +- Update to 2.2.3 release + * Sat Jul 27 2019 Fedora Release Engineering - 2.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ba5cd75e1f3b0cba36415c29721958fdd35aa085 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 10 Sep 2019 10:41:44 +0200 Subject: [PATCH 35/59] Fix building in C99 mode --- xreader-c99.patch | 172 ++++++++++++++++++++++++++++++++++++++++++++++ xreader.spec | 6 +- 2 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 xreader-c99.patch diff --git a/xreader-c99.patch b/xreader-c99.patch new file mode 100644 index 0000000..2602ea2 --- /dev/null +++ b/xreader-c99.patch @@ -0,0 +1,172 @@ +commit f42cb2b5dbc58c4af053b71a35629f9d7e6f612b +Author: Peter Moser +Date: Thu Sep 5 14:04:41 2019 +0200 + + Fix compile warnings (#317) + +diff --git a/backend/dvi/mdvi-lib/bitmap.c b/backend/dvi/mdvi-lib/bitmap.c +index 4417a75..1d83b89 100644 +--- a/backend/dvi/mdvi-lib/bitmap.c ++++ b/backend/dvi/mdvi-lib/bitmap.c +@@ -20,6 +20,7 @@ + + #include + #include ++#include + + #include "mdvi.h" + #include "color.h" +diff --git a/backend/dvi/mdvi-lib/common.h b/backend/dvi/mdvi-lib/common.h +index 30eaa79..b95af67 100644 +--- a/backend/dvi/mdvi-lib/common.h ++++ b/backend/dvi/mdvi-lib/common.h +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #include "sysdeps.h" + +diff --git a/backend/dvi/mdvi-lib/files.c b/backend/dvi/mdvi-lib/files.c +index b706506..0a0a9a8 100644 +--- a/backend/dvi/mdvi-lib/files.c ++++ b/backend/dvi/mdvi-lib/files.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + + #include "common.h" +diff --git a/backend/dvi/mdvi-lib/font.c b/backend/dvi/mdvi-lib/font.c +index 2f655df..df06b5d 100644 +--- a/backend/dvi/mdvi-lib/font.c ++++ b/backend/dvi/mdvi-lib/font.c +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + #include "mdvi.h" + #include "private.h" +diff --git a/backend/dvi/mdvi-lib/fontmap.c b/backend/dvi/mdvi-lib/fontmap.c +index 1110168..41aabc5 100644 +--- a/backend/dvi/mdvi-lib/fontmap.c ++++ b/backend/dvi/mdvi-lib/fontmap.c +@@ -706,7 +706,7 @@ static int mdvi_init_fontmaps(void) + FILE *in; + Dstring input; + int count = 0; +- char *config; ++ const char *config; + + if(fontmaps_loaded) + return 0; +diff --git a/backend/dvi/mdvi-lib/hash.c b/backend/dvi/mdvi-lib/hash.c +index d359e3c..5dcd35d 100644 +--- a/backend/dvi/mdvi-lib/hash.c ++++ b/backend/dvi/mdvi-lib/hash.c +@@ -17,6 +17,7 @@ + */ + + #include ++#include + #include "mdvi.h" + + /* simple hash tables for MDVI */ +diff --git a/backend/epub/epub-document.c b/backend/epub/epub-document.c +index fa53527..85845d6 100644 +--- a/backend/epub/epub-document.c ++++ b/backend/epub/epub-document.c +@@ -352,7 +352,7 @@ epub_document_save (EvDocument *document, + { + EpubDocument *epub_document = EPUB_DOCUMENT (document); + +- gchar *source_uri = g_filename_to_uri (epub_document->archivename, NULL, &error); ++ gchar *source_uri = g_filename_to_uri (epub_document->archivename, NULL, error); + if (source_uri == NULL) + return FALSE; + +@@ -1503,12 +1503,6 @@ add_night_sheet(contentListNode *listdata,gchar *sheet) + open_xml_document(listdata->value); + + set_xml_root_node(NULL); +- xmlNodePtr head = xml_get_pointer_to_node((xmlChar*)"head",NULL,NULL); +- +- xmlNodePtr link = xmlNewTextChild(head,NULL,(xmlChar*)"link",NULL); +- xmlAttrPtr href = xmlNewProp(link,(xmlChar*)"href",(xmlChar*)sheeturi); +- xmlAttrPtr rel = xmlNewProp(link,(xmlChar*)"rel",(xmlChar*)"alternate stylesheet"); +- xmlAttrPtr class = xmlNewProp(link,(xmlChar*)"class",(xmlChar*)"night"); + + xmlSaveFormatFile (listdata->value, xmldocument, 0); + xml_free_doc(); +@@ -1656,7 +1650,6 @@ static void + epub_document_add_mathJax(gchar* containeruri,gchar* documentdir) + { + gchar *containerfilename= g_filename_from_uri(containeruri,NULL,NULL); +- const gchar *backenddir = ev_backends_manager_get_backends_dir(); + GString *mathjaxdir = g_string_new(MATHJAX_DIRECTORY); + + gchar *mathjaxref = g_filename_to_uri(mathjaxdir->str,NULL,NULL); +diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c +index 1922666..4e5e1f3 100644 +--- a/shell/eggfindbar.c ++++ b/shell/eggfindbar.c +@@ -287,7 +287,6 @@ egg_find_bar_init (EggFindBar *find_bar) + { + EggFindBarPrivate *priv; + GtkWidget *label; +- GtkWidget *alignment; + GtkWidget *box; + GtkToolItem *item; + GtkWidget *arrow; +diff --git a/shell/ev-preferences-dialog.c b/shell/ev-preferences-dialog.c +index 5f99b4a..fc04a38 100644 +--- a/shell/ev-preferences-dialog.c ++++ b/shell/ev-preferences-dialog.c +@@ -90,7 +90,7 @@ help_button_clicked(GtkButton *button, + gpointer data) + { + EvPreferencesDialog *dlg = EV_PREFERENCES_DIALOG(data); +- ev_window_show_help(GTK_WINDOW(dlg), NULL); ++ ev_window_show_help(EV_WINDOW(dlg), NULL); + } + + static void +diff --git a/shell/ev-properties-view.c b/shell/ev-properties-view.c +index 267ac36..7bb4692 100644 +--- a/shell/ev-properties-view.c ++++ b/shell/ev-properties-view.c +@@ -358,12 +358,12 @@ ev_properties_view_set_info (EvPropertiesView *properties, const EvDocumentInfo + } + if (info->fields_mask & EV_DOCUMENT_INFO_LINEARIZED) + { +- /* nice hack bro */ +- if (info->linearized == 1) ++ /* Sometimes info->linearized is not a string */ ++ if (info->linearized == (char *)1) + { + set_property (properties, GTK_TABLE (table), LINEARIZED_PROPERTY, _("Yes"), &row); + } +- else if (info->linearized == 0) ++ else if (info->linearized == (char *)0) + { + set_property (properties, GTK_TABLE (table), LINEARIZED_PROPERTY, _("No"), &row); + } +diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c +index 7c4fd04..937ae99 100644 +--- a/shell/ev-window-title.c ++++ b/shell/ev-window-title.c +@@ -176,6 +176,9 @@ ev_window_title_update (EvWindowTitle *window_title) + gtk_window_set_title (window, password_title); + g_free (password_title); + break; ++ case EV_WINDOW_TITLE_RECENT: ++ /*Nothing to do; keep compiler quiet */ ++ break; + } + + g_free (title); diff --git a/xreader.spec b/xreader.spec index 89ee097..95a3c16 100644 --- a/xreader.spec +++ b/xreader.spec @@ -3,12 +3,13 @@ Name: xreader Version: 2.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch1: xreader-c99.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -133,6 +134,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Tue Sep 10 2019 Florian Weimer - 2.2.3-2 +- Fix building in C99 mode + * Wed Jul 31 2019 Leigh Scott - 2.2.3-1 - Update to 2.2.3 release From 6b21d5f0594cfe5dae5c7b222155e65967418721 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 25 Nov 2019 18:32:31 +0000 Subject: [PATCH 36/59] Update to 2.4.0 release --- sources | 2 +- xreader.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 1e10a11..a069458 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.2.3.tar.gz) = 97d8a21a5846965fdbfe1aee1d84982f3d94fafb67d5ea7cefc6ea8e515e7de1559a9faf903f5ec4f3882b3742cca9d1a7c8b7e566b8bb0b76029510e4599508 +SHA512 (xreader-2.4.0.tar.gz) = 3343049bce926533fc0288c0db29867929ca7fb3a82efef072175e5263acfaa1a74af4181591a60d1f4de7e6447608e6aa253f19d1067be4c78ba6193f0e9984 diff --git a/xreader.spec b/xreader.spec index 95a3c16..d0a6f56 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,14 +2,14 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.2.3 -Release: 2%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: Simple document viewer License: GPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch1: xreader-c99.patch +Patch1: xreader-c99.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -134,6 +134,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Fri Nov 22 2019 Leigh Scott - 2.4.0-1 +- Update to 2.4.0 release + * Tue Sep 10 2019 Florian Weimer - 2.2.3-2 - Fix building in C99 mode From 84e56f9c30f937fa75059a1dbf0b1dccdab10601 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 25 Nov 2019 19:22:32 +0000 Subject: [PATCH 37/59] Drop upstream patch --- xreader-c99.patch | 172 ---------------------------------------------- xreader.spec | 3 +- 2 files changed, 1 insertion(+), 174 deletions(-) delete mode 100644 xreader-c99.patch diff --git a/xreader-c99.patch b/xreader-c99.patch deleted file mode 100644 index 2602ea2..0000000 --- a/xreader-c99.patch +++ /dev/null @@ -1,172 +0,0 @@ -commit f42cb2b5dbc58c4af053b71a35629f9d7e6f612b -Author: Peter Moser -Date: Thu Sep 5 14:04:41 2019 +0200 - - Fix compile warnings (#317) - -diff --git a/backend/dvi/mdvi-lib/bitmap.c b/backend/dvi/mdvi-lib/bitmap.c -index 4417a75..1d83b89 100644 ---- a/backend/dvi/mdvi-lib/bitmap.c -+++ b/backend/dvi/mdvi-lib/bitmap.c -@@ -20,6 +20,7 @@ - - #include - #include -+#include - - #include "mdvi.h" - #include "color.h" -diff --git a/backend/dvi/mdvi-lib/common.h b/backend/dvi/mdvi-lib/common.h -index 30eaa79..b95af67 100644 ---- a/backend/dvi/mdvi-lib/common.h -+++ b/backend/dvi/mdvi-lib/common.h -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include "sysdeps.h" - -diff --git a/backend/dvi/mdvi-lib/files.c b/backend/dvi/mdvi-lib/files.c -index b706506..0a0a9a8 100644 ---- a/backend/dvi/mdvi-lib/files.c -+++ b/backend/dvi/mdvi-lib/files.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - - #include "common.h" -diff --git a/backend/dvi/mdvi-lib/font.c b/backend/dvi/mdvi-lib/font.c -index 2f655df..df06b5d 100644 ---- a/backend/dvi/mdvi-lib/font.c -+++ b/backend/dvi/mdvi-lib/font.c -@@ -18,6 +18,7 @@ - - #include - #include -+#include - - #include "mdvi.h" - #include "private.h" -diff --git a/backend/dvi/mdvi-lib/fontmap.c b/backend/dvi/mdvi-lib/fontmap.c -index 1110168..41aabc5 100644 ---- a/backend/dvi/mdvi-lib/fontmap.c -+++ b/backend/dvi/mdvi-lib/fontmap.c -@@ -706,7 +706,7 @@ static int mdvi_init_fontmaps(void) - FILE *in; - Dstring input; - int count = 0; -- char *config; -+ const char *config; - - if(fontmaps_loaded) - return 0; -diff --git a/backend/dvi/mdvi-lib/hash.c b/backend/dvi/mdvi-lib/hash.c -index d359e3c..5dcd35d 100644 ---- a/backend/dvi/mdvi-lib/hash.c -+++ b/backend/dvi/mdvi-lib/hash.c -@@ -17,6 +17,7 @@ - */ - - #include -+#include - #include "mdvi.h" - - /* simple hash tables for MDVI */ -diff --git a/backend/epub/epub-document.c b/backend/epub/epub-document.c -index fa53527..85845d6 100644 ---- a/backend/epub/epub-document.c -+++ b/backend/epub/epub-document.c -@@ -352,7 +352,7 @@ epub_document_save (EvDocument *document, - { - EpubDocument *epub_document = EPUB_DOCUMENT (document); - -- gchar *source_uri = g_filename_to_uri (epub_document->archivename, NULL, &error); -+ gchar *source_uri = g_filename_to_uri (epub_document->archivename, NULL, error); - if (source_uri == NULL) - return FALSE; - -@@ -1503,12 +1503,6 @@ add_night_sheet(contentListNode *listdata,gchar *sheet) - open_xml_document(listdata->value); - - set_xml_root_node(NULL); -- xmlNodePtr head = xml_get_pointer_to_node((xmlChar*)"head",NULL,NULL); -- -- xmlNodePtr link = xmlNewTextChild(head,NULL,(xmlChar*)"link",NULL); -- xmlAttrPtr href = xmlNewProp(link,(xmlChar*)"href",(xmlChar*)sheeturi); -- xmlAttrPtr rel = xmlNewProp(link,(xmlChar*)"rel",(xmlChar*)"alternate stylesheet"); -- xmlAttrPtr class = xmlNewProp(link,(xmlChar*)"class",(xmlChar*)"night"); - - xmlSaveFormatFile (listdata->value, xmldocument, 0); - xml_free_doc(); -@@ -1656,7 +1650,6 @@ static void - epub_document_add_mathJax(gchar* containeruri,gchar* documentdir) - { - gchar *containerfilename= g_filename_from_uri(containeruri,NULL,NULL); -- const gchar *backenddir = ev_backends_manager_get_backends_dir(); - GString *mathjaxdir = g_string_new(MATHJAX_DIRECTORY); - - gchar *mathjaxref = g_filename_to_uri(mathjaxdir->str,NULL,NULL); -diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c -index 1922666..4e5e1f3 100644 ---- a/shell/eggfindbar.c -+++ b/shell/eggfindbar.c -@@ -287,7 +287,6 @@ egg_find_bar_init (EggFindBar *find_bar) - { - EggFindBarPrivate *priv; - GtkWidget *label; -- GtkWidget *alignment; - GtkWidget *box; - GtkToolItem *item; - GtkWidget *arrow; -diff --git a/shell/ev-preferences-dialog.c b/shell/ev-preferences-dialog.c -index 5f99b4a..fc04a38 100644 ---- a/shell/ev-preferences-dialog.c -+++ b/shell/ev-preferences-dialog.c -@@ -90,7 +90,7 @@ help_button_clicked(GtkButton *button, - gpointer data) - { - EvPreferencesDialog *dlg = EV_PREFERENCES_DIALOG(data); -- ev_window_show_help(GTK_WINDOW(dlg), NULL); -+ ev_window_show_help(EV_WINDOW(dlg), NULL); - } - - static void -diff --git a/shell/ev-properties-view.c b/shell/ev-properties-view.c -index 267ac36..7bb4692 100644 ---- a/shell/ev-properties-view.c -+++ b/shell/ev-properties-view.c -@@ -358,12 +358,12 @@ ev_properties_view_set_info (EvPropertiesView *properties, const EvDocumentInfo - } - if (info->fields_mask & EV_DOCUMENT_INFO_LINEARIZED) - { -- /* nice hack bro */ -- if (info->linearized == 1) -+ /* Sometimes info->linearized is not a string */ -+ if (info->linearized == (char *)1) - { - set_property (properties, GTK_TABLE (table), LINEARIZED_PROPERTY, _("Yes"), &row); - } -- else if (info->linearized == 0) -+ else if (info->linearized == (char *)0) - { - set_property (properties, GTK_TABLE (table), LINEARIZED_PROPERTY, _("No"), &row); - } -diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c -index 7c4fd04..937ae99 100644 ---- a/shell/ev-window-title.c -+++ b/shell/ev-window-title.c -@@ -176,6 +176,9 @@ ev_window_title_update (EvWindowTitle *window_title) - gtk_window_set_title (window, password_title); - g_free (password_title); - break; -+ case EV_WINDOW_TITLE_RECENT: -+ /*Nothing to do; keep compiler quiet */ -+ break; - } - - g_free (title); diff --git a/xreader.spec b/xreader.spec index d0a6f56..b3edb4d 100644 --- a/xreader.spec +++ b/xreader.spec @@ -9,9 +9,8 @@ Summary: Simple document viewer License: GPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch1: xreader-c99.patch -BuildRequires: cmake +BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: meson BuildRequires: mathjax From 7e9953395baeecbf47c3dc0f5f0845d545a52b46 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 26 Nov 2019 17:40:47 +0000 Subject: [PATCH 38/59] Update to 2.4.1 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a069458..08cf98d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.4.0.tar.gz) = 3343049bce926533fc0288c0db29867929ca7fb3a82efef072175e5263acfaa1a74af4181591a60d1f4de7e6447608e6aa253f19d1067be4c78ba6193f0e9984 +SHA512 (xreader-2.4.1.tar.gz) = e553132e1ee06abb09cae7c9ddc2a8711cd7f128ff4cfd00b0043cb453bd7edbf444cf2db2c1b4bc2c5f30775c5aa2007d32b02c3de4bd0d92895ddc46dc9c65 diff --git a/xreader.spec b/xreader.spec index b3edb4d..a7054f8 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.4.0 +Version: 2.4.1 Release: 1%{?dist} Summary: Simple document viewer @@ -133,6 +133,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Tue Nov 26 2019 Leigh Scott - 2.4.1-1 +- Update to 2.4.1 release + * Fri Nov 22 2019 Leigh Scott - 2.4.0-1 - Update to 2.4.0 release From b548b50a59e92e294ec7dfbf4f3c4d68dd963eea Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 28 Nov 2019 21:17:41 +0000 Subject: [PATCH 39/59] Update to 2.4.2 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 08cf98d..1653a99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.4.1.tar.gz) = e553132e1ee06abb09cae7c9ddc2a8711cd7f128ff4cfd00b0043cb453bd7edbf444cf2db2c1b4bc2c5f30775c5aa2007d32b02c3de4bd0d92895ddc46dc9c65 +SHA512 (xreader-2.4.2.tar.gz) = 6c2a4af17c644ae0cacb2c8c01c33c5da41e7c74e873ff4fbb0605f995d6950fcd9b3bec2827726dc81cda0c0caf94a47fce709f224e25c41c77854b894cc83d diff --git a/xreader.spec b/xreader.spec index a7054f8..ffc46a0 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.4.1 +Version: 2.4.2 Release: 1%{?dist} Summary: Simple document viewer @@ -133,6 +133,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Thu Nov 28 2019 Leigh Scott - 2.4.2-1 +- Update to 2.4.2 release + * Tue Nov 26 2019 Leigh Scott - 2.4.1-1 - Update to 2.4.1 release From aef4d9ca1c4f7834bc04fd70843b5e03035ab7fe Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 11 Dec 2019 14:59:06 +0000 Subject: [PATCH 40/59] Update to 2.4.3 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 1653a99..1a53219 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.4.2.tar.gz) = 6c2a4af17c644ae0cacb2c8c01c33c5da41e7c74e873ff4fbb0605f995d6950fcd9b3bec2827726dc81cda0c0caf94a47fce709f224e25c41c77854b894cc83d +SHA512 (xreader-2.4.3.tar.gz) = 5c12965100ce4d5d7ae80c6a19af00dca5d6f0bcd43780c4f87b6aecc459490e20fdaf1ddd23cf706d23de1cfede893a79dc272e5a6927aea82e01d0fd7b8e60 diff --git a/xreader.spec b/xreader.spec index ffc46a0..3208413 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.4.2 +Version: 2.4.3 Release: 1%{?dist} Summary: Simple document viewer @@ -133,6 +133,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Wed Dec 11 2019 Leigh Scott - 2.4.3-1 +- Update to 2.4.3 release + * Thu Nov 28 2019 Leigh Scott - 2.4.2-1 - Update to 2.4.2 release From e124e7423c3706071b98ca23a35a71edd45abf67 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 10 Jan 2020 09:48:38 +0000 Subject: [PATCH 41/59] Update to 2.4.4 release --- sources | 2 +- xreader.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 1a53219..d4f12a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.4.3.tar.gz) = 5c12965100ce4d5d7ae80c6a19af00dca5d6f0bcd43780c4f87b6aecc459490e20fdaf1ddd23cf706d23de1cfede893a79dc272e5a6927aea82e01d0fd7b8e60 +SHA512 (xreader-2.4.4.tar.gz) = 5ac8ccea38c5b02ddce4bf8ed1cd9b22d914e8752d6dbcdce456bdd8fc645c0a8b8fedf8aab492ef95715c567d40bf61f7002df3ed282f05ce40a72d8db5f356 diff --git a/xreader.spec b/xreader.spec index 3208413..685f47e 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} Summary: Simple document viewer @@ -80,7 +80,8 @@ This package contains the documentation files for %{name}. -Dpixbuf=true \ -Dcomics=true \ -Dintrospection=true \ - -Dhelp_files=true + -Dhelp_files=true \ + -Dtests=false %meson_build @@ -133,6 +134,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Fri Jan 10 2020 Leigh Scott - 2.4.4-1 +- Update to 2.4.4 release + * Wed Dec 11 2019 Leigh Scott - 2.4.3-1 - Update to 2.4.3 release From c3b7cb6ede15a7a25352669307809a98526d1cce Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 10 Jan 2020 13:38:50 +0000 Subject: [PATCH 42/59] Add build requires t1lib-devel --- xreader.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index 685f47e..61be820 100644 --- a/xreader.spec +++ b/xreader.spec @@ -3,7 +3,7 @@ Name: xreader Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -39,6 +39,7 @@ BuildRequires: pkgconfig(xapp) >= 1.4.0 BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: texlive +BuildRequires: t1lib-devel BuildRequires: yelp-tools Requires: shared-mime-info%{?_isa} @@ -134,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Fri Jan 10 2020 Leigh Scott - 2.4.4-2 +- Add build requires t1lib-devel + * Fri Jan 10 2020 Leigh Scott - 2.4.4-1 - Update to 2.4.4 release From ea2446458e99df4fe0588fff212dc44b111b6588 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Fri, 17 Jan 2020 12:30:04 +0100 Subject: [PATCH 43/59] Rebuild for poppler-0.84.0 --- xreader.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index 61be820..a59d724 100644 --- a/xreader.spec +++ b/xreader.spec @@ -3,7 +3,7 @@ Name: xreader Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -135,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Fri Jan 17 2020 Marek Kasik - 2.4.4-3 +- Rebuild for poppler-0.84.0 + * Fri Jan 10 2020 Leigh Scott - 2.4.4-2 - Add build requires t1lib-devel From dfcb6065d41e6c88d369d0f512e91ba2689b91fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:53:55 +0000 Subject: [PATCH 44/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xreader.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index a59d724..2ab048f 100644 --- a/xreader.spec +++ b/xreader.spec @@ -3,7 +3,7 @@ Name: xreader Version: 2.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -135,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.4.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 17 2020 Marek Kasik - 2.4.4-3 - Rebuild for poppler-0.84.0 From 43f30f6369bed072c429a5b6f5b8d4c0b0fbfef8 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 12 May 2020 11:54:13 +0100 Subject: [PATCH 45/59] Update to 2.6.0 release --- sources | 2 +- xreader.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index d4f12a5..adf6929 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.4.4.tar.gz) = 5ac8ccea38c5b02ddce4bf8ed1cd9b22d914e8752d6dbcdce456bdd8fc645c0a8b8fedf8aab492ef95715c567d40bf61f7002df3ed282f05ce40a72d8db5f356 +SHA512 (xreader-2.6.0.tar.gz) = 9fb7132369e60cdbb6a79c5b32029ed6e7aaf7de5981430def0e41120fe54788ce4d59c6d3cd828389cbde71acfda3622c8ac272869b7630e63bfa9bf904bfba diff --git a/xreader.spec b/xreader.spec index 2ab048f..2cb1d7e 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,8 +2,8 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.4.4 -Release: 4%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -135,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Tue May 12 2020 Leigh Scott - 2.6.0-1 +- Update to 2.6.0 release + * Fri Jan 31 2020 Fedora Release Engineering - 2.4.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 80b10b0b35e32dbcc2aa23328dc465a0bb6b76d5 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 23 May 2020 13:10:22 +0100 Subject: [PATCH 46/59] Update to 2.6.1 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index adf6929..b455b98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.6.0.tar.gz) = 9fb7132369e60cdbb6a79c5b32029ed6e7aaf7de5981430def0e41120fe54788ce4d59c6d3cd828389cbde71acfda3622c8ac272869b7630e63bfa9bf904bfba +SHA512 (xreader-2.6.1.tar.gz) = 8268831dbf8d39628707c2a5930bacc24a83eceb0026a9bb2e8c6b0cc8952f86368c4727a0a9e1c62f54f2a353576c111d3c200240b2893b6095b7ddbcef375d diff --git a/xreader.spec b/xreader.spec index 2cb1d7e..7a37289 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.6.0 +Version: 2.6.1 Release: 1%{?dist} Summary: Simple document viewer @@ -135,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Sat May 23 2020 Leigh Scott - 2.6.1-1 +- Update to 2.6.1 release + * Tue May 12 2020 Leigh Scott - 2.6.0-1 - Update to 2.6.0 release From 4a483c1df78f31256023fefdbb880ef21f559b15 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 6 Jun 2020 15:48:03 +0100 Subject: [PATCH 47/59] Update to 2.6.2 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b455b98..a2785cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.6.1.tar.gz) = 8268831dbf8d39628707c2a5930bacc24a83eceb0026a9bb2e8c6b0cc8952f86368c4727a0a9e1c62f54f2a353576c111d3c200240b2893b6095b7ddbcef375d +SHA512 (xreader-2.6.2.tar.gz) = b2b032b9f085b76fd649122732c73b0205963918a001e55edb5da6350786753e2fdb29f3625881794f925e93646bdf0b738f45fbefb2808be60ab8d5a0ce0f31 diff --git a/xreader.spec b/xreader.spec index 7a37289..f10f344 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.6.1 +Version: 2.6.2 Release: 1%{?dist} Summary: Simple document viewer @@ -135,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Sat Jun 06 2020 Leigh Scott - 2.6.2-1 +- Update to 2.6.2 release + * Sat May 23 2020 Leigh Scott - 2.6.1-1 - Update to 2.6.1 release From bd2217610bbd4a8b8a9d9946e1016b703d4898ae Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 14 Jul 2020 08:27:42 +0100 Subject: [PATCH 48/59] Update to 2.6.4 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a2785cd..9ddd0d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.6.2.tar.gz) = b2b032b9f085b76fd649122732c73b0205963918a001e55edb5da6350786753e2fdb29f3625881794f925e93646bdf0b738f45fbefb2808be60ab8d5a0ce0f31 +SHA512 (xreader-2.6.4.tar.gz) = 92e9d38780d052246248594a649e7ba69eec2a32bdb0c13f35686f733dfd540b64c4d95387fdf1acdbbab45d5601a61a3dd108e5ff9250d94ea116d9753ee5a6 diff --git a/xreader.spec b/xreader.spec index f10f344..6d95f7e 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.6.2 +Version: 2.6.4 Release: 1%{?dist} Summary: Simple document viewer @@ -135,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Tue Jul 14 2020 Leigh Scott - 2.6.4-1 +- Update to 2.6.4 release + * Sat Jun 06 2020 Leigh Scott - 2.6.2-1 - Update to 2.6.2 release From 0de20c35bfc7059b4b93484438a3819487341410 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:04:08 +0000 Subject: [PATCH 49/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xreader.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index 6d95f7e..cc2c4ce 100644 --- a/xreader.spec +++ b/xreader.spec @@ -3,7 +3,7 @@ Name: xreader Version: 2.6.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -135,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 14 2020 Leigh Scott - 2.6.4-1 - Update to 2.6.4 release From d9fa00c72015d13818b9cb156fc6e793655887c7 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 2 Dec 2020 23:50:26 +0000 Subject: [PATCH 50/59] Update to 2.8.0 release --- sources | 2 +- xreader.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 9ddd0d7..85fa6a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.6.4.tar.gz) = 92e9d38780d052246248594a649e7ba69eec2a32bdb0c13f35686f733dfd540b64c4d95387fdf1acdbbab45d5601a61a3dd108e5ff9250d94ea116d9753ee5a6 +SHA512 (xreader-2.8.0.tar.gz) = 919bf8c82427c3239cf6278475a1364e2e903516866241ca6b67b0151ce47302747e9d2a6ad8293f1f79288dd372e34aea91848700bea351ca2d731cdd54ff42 diff --git a/xreader.spec b/xreader.spec index cc2c4ce..3dacd4c 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,8 +2,8 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.6.4 -Release: 2%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -135,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Wed Dec 2 2020 Leigh Scott - 2.8.0-1 +- Update to 2.8.0 release + * Wed Jul 29 2020 Fedora Release Engineering - 2.6.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 8b5fd252da7c95efec3eb36380d842710be85cff Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 10 Dec 2020 12:41:30 +0000 Subject: [PATCH 51/59] Update to 2.8.1 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 85fa6a6..5f871a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.8.0.tar.gz) = 919bf8c82427c3239cf6278475a1364e2e903516866241ca6b67b0151ce47302747e9d2a6ad8293f1f79288dd372e34aea91848700bea351ca2d731cdd54ff42 +SHA512 (xreader-2.8.1.tar.gz) = 65053ab7509c0c349d21846baedba5b005d508226e100e953fd8bba1e0a757fd994f0f949e0c4bd9062586c37a81ec611ac08da8bfdd4ce35bcae00b86824cdb diff --git a/xreader.spec b/xreader.spec index 3dacd4c..3a3f6d0 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.8.0 +Version: 2.8.1 Release: 1%{?dist} Summary: Simple document viewer @@ -135,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Thu Dec 10 2020 Leigh Scott - 2.8.1-1 +- Update to 2.8.1 release + * Wed Dec 2 2020 Leigh Scott - 2.8.0-1 - Update to 2.8.0 release From 7e46b88f7e141099d93b5fd6213cc0cb74ab9435 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 2 Jan 2021 21:43:24 +0000 Subject: [PATCH 52/59] Update to 2.8.2 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5f871a3..14cdf05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.8.1.tar.gz) = 65053ab7509c0c349d21846baedba5b005d508226e100e953fd8bba1e0a757fd994f0f949e0c4bd9062586c37a81ec611ac08da8bfdd4ce35bcae00b86824cdb +SHA512 (xreader-2.8.2.tar.gz) = fa82dd57f9e9ba9f91311ee0e1a9b840d618b819e5147c9395aa75022ff1be4ab484d1d302c04065b72cb1defd98752a149d67a68d7a0f4b309a23ec06e27beb diff --git a/xreader.spec b/xreader.spec index 3a3f6d0..c34d78d 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.8.1 +Version: 2.8.2 Release: 1%{?dist} Summary: Simple document viewer @@ -135,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Sat Jan 2 2021 Leigh Scott - 2.8.2-1 +- Update to 2.8.2 release + * Thu Dec 10 2020 Leigh Scott - 2.8.1-1 - Update to 2.8.1 release From 7f4834a939e1bf4e868abe8edc847ece4c049e96 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 13 Jan 2021 15:14:38 +0000 Subject: [PATCH 53/59] Update to 2.8.3 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 14cdf05..2f1c9ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.8.2.tar.gz) = fa82dd57f9e9ba9f91311ee0e1a9b840d618b819e5147c9395aa75022ff1be4ab484d1d302c04065b72cb1defd98752a149d67a68d7a0f4b309a23ec06e27beb +SHA512 (xreader-2.8.3.tar.gz) = 94d610dd14f43278171e40a5db191b81c8c097897d022ad9d2747b9be9fced45d7154cd2b5cc6b2ccdc09c073f59eec06f8bd058d73530b125a75d7a7eb9a7f0 diff --git a/xreader.spec b/xreader.spec index c34d78d..3aa6983 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.8.2 +Version: 2.8.3 Release: 1%{?dist} Summary: Simple document viewer @@ -135,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Wed Jan 13 2021 Leigh Scott - 2.8.3-1 +- Update to 2.8.3 release + * Sat Jan 2 2021 Leigh Scott - 2.8.2-1 - Update to 2.8.2 release From 2b66d7a1a80a420b6a16eee01e3b7f233851bbf2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:22:48 +0000 Subject: [PATCH 54/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xreader.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xreader.spec b/xreader.spec index 3aa6983..46bd4fb 100644 --- a/xreader.spec +++ b/xreader.spec @@ -3,7 +3,7 @@ Name: xreader Version: 2.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -135,6 +135,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 2.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 13 2021 Leigh Scott - 2.8.3-1 - Update to 2.8.3 release From 81b511e04529d22932fa9f89d2e5dbb0ed72cc00 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sat, 6 Mar 2021 17:55:46 -0500 Subject: [PATCH 55/59] Create subpackages for libs, data, and thumbnailer --- xreader.spec | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/xreader.spec b/xreader.spec index 46bd4fb..7e0745f 100644 --- a/xreader.spec +++ b/xreader.spec @@ -3,7 +3,7 @@ Name: xreader Version: 2.8.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -45,6 +45,7 @@ BuildRequires: yelp-tools Requires: shared-mime-info%{?_isa} Requires: gsettings-desktop-schemas%{?_isa} Requires: xapps%{?_isa} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Recommends: yelp%{?_isa} @@ -52,10 +53,16 @@ Recommends: yelp%{?_isa} X-Apps Document Reader is a document viewer capable of displaying multiple and single page document formats like PDF and PostScript. +%package libs +Summary: xreader document viewer libraries +Requires: %{name}-data = %{version}-%{release} + +%description libs +This package contains the shared library files for %{name}. %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 for %{name}. @@ -68,6 +75,21 @@ BuildArch: noarch %description doc This package contains the documentation files for %{name}. +%package data +Summary: Support files for the %{name} document viewer +BuildArch: noarch + +%description data +This package contains icons and other support files used by the +%{name} application and libraries. + +%package thumbnailer +Summary: System thumbnailer using %{name} libraries +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description thumbnailer +This package adds configuration to use %{name} as a thumbnailer. + %prep %autosetup -p1 @@ -108,20 +130,30 @@ This package contains the documentation files for %{name}. %files -f %{name}.lang %license AUTHORS COPYING debian/copyright %doc ChangeLog README debian/changelog -%{_bindir}/%{name}* -%{_datadir}/%{name}/ +%{_bindir}/%{name} +%{_bindir}/%{name}-previewer %{_datadir}/applications/%{name}.desktop %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/dbus-1/services/* %{_datadir}/glib-2.0/schemas/* %{_datadir}/help/*/%{name}/ %{_datadir}/icons/hicolor/*/*/* -%{_datadir}/thumbnailers/%{name}.thumbnailer +%{_libexecdir}/xreaderd +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}-previewer.1* + +%files libs %{_libdir}/girepository-1.0/* %{_libdir}/*.so.* %{_libdir}/%{name}/ -%{_libexecdir}/xreaderd -%{_mandir}/man?/*.* + +%files data +%{_datadir}/%{name}/ + +%files thumbnailer +%{_bindir}/%{name}-thumbnailer +%{_datadir}/thumbnailers/%{name}.thumbnailer +%{_mandir}/man1/%{name}-thumbnailer.1* %files devel %{_datadir}/gir-1.0/* @@ -135,6 +167,9 @@ This package contains the documentation files for %{name}. %doc %{_datadir}/doc/%{name}* %changelog +* Sun Feb 28 2021 FeRD (Frank Dana) - 2.8.3-3 +- Create subpackages for libs, data, and thumbnailer (rhbz#1933895) + * Thu Jan 28 2021 Fedora Release Engineering - 2.8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 5c71057f675e56cb41af0ba9ca73236956fc6571 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 1 Jun 2021 16:14:10 +0100 Subject: [PATCH 56/59] Update to 3.0.0 release --- sources | 2 +- xreader.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 2f1c9ea..dbac98f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-2.8.3.tar.gz) = 94d610dd14f43278171e40a5db191b81c8c097897d022ad9d2747b9be9fced45d7154cd2b5cc6b2ccdc09c073f59eec06f8bd058d73530b125a75d7a7eb9a7f0 +SHA512 (xreader-3.0.0.tar.gz) = 6433b2b82d0fd33cf0fb7f5772cb95ffacf3b6f31a6ca16c7e20b9168e57991f2508e03e56a9b4225f909722d2fcfd047e82595a0b79237f2ea9d44e7233b751 diff --git a/xreader.spec b/xreader.spec index 7e0745f..29fbff4 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,8 +2,8 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 2.8.3 -Release: 3%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -167,6 +167,9 @@ This package adds configuration to use %{name} as a thumbnailer. %doc %{_datadir}/doc/%{name}* %changelog +* Tue Jun 01 2021 Leigh Scott - 3.0.0-1 +- Update to 3.0.0 release + * Sun Feb 28 2021 FeRD (Frank Dana) - 2.8.3-3 - Create subpackages for libs, data, and thumbnailer (rhbz#1933895) From 89ef9eba193b8454fd0c81b0aa356bb28d0fe0dd Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 1 Jun 2021 16:24:37 +0100 Subject: [PATCH 57/59] fix --- xreader.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xreader.spec b/xreader.spec index 29fbff4..625d486 100644 --- a/xreader.spec +++ b/xreader.spec @@ -113,7 +113,7 @@ This package adds configuration to use %{name} as a thumbnailer. %{_bindir}/find %{buildroot} -type f -name '*.a' -print -delete %{_bindir}/find %{buildroot} -type f -name '*.la' -print -delete %{__sed} -i -e '/.*.*/d' \ - %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml + %{buildroot}%{_metainfodir}/%{name}.appdata.xml %find_lang %{name} %check @@ -123,7 +123,7 @@ This package adds configuration to use %{name} as a thumbnailer. # Validate AppData-files. %{_bindir}/appstream-util validate-relax --nonet \ - %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml + %{buildroot}%{_metainfodir}/%{name}.appdata.xml %ldconfig_scriptlets @@ -133,7 +133,7 @@ This package adds configuration to use %{name} as a thumbnailer. %{_bindir}/%{name} %{_bindir}/%{name}-previewer %{_datadir}/applications/%{name}.desktop -%{_datadir}/appdata/%{name}.appdata.xml +%{_metainfodir}/%{name}.appdata.xml %{_datadir}/dbus-1/services/* %{_datadir}/glib-2.0/schemas/* %{_datadir}/help/*/%{name}/ From 13141854918f48c0dc9e2ea3a55425d4b7bf1fd3 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 10 Jun 2021 19:07:32 +0100 Subject: [PATCH 58/59] Update to 3.0.1 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index dbac98f..652e448 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-3.0.0.tar.gz) = 6433b2b82d0fd33cf0fb7f5772cb95ffacf3b6f31a6ca16c7e20b9168e57991f2508e03e56a9b4225f909722d2fcfd047e82595a0b79237f2ea9d44e7233b751 +SHA512 (xreader-3.0.1.tar.gz) = c6bd924dba80849e8d0ed2913cad166fa4f96ac211cf7526719c1198fc8d2bd35c16e8425682130b23b1431db7edd1bcb42aaf7478942c5317f51a7518280801 diff --git a/xreader.spec b/xreader.spec index 625d486..5c2ae5a 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} Summary: Simple document viewer @@ -167,6 +167,9 @@ This package adds configuration to use %{name} as a thumbnailer. %doc %{_datadir}/doc/%{name}* %changelog +* Thu Jun 10 2021 Leigh Scott - 3.0.1-1 +- Update to 3.0.1 release + * Tue Jun 01 2021 Leigh Scott - 3.0.0-1 - Update to 3.0.0 release From 8fbb903ae1ce24b6516f8d7969860bc90c7232ce Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 25 Jun 2021 15:36:52 +0100 Subject: [PATCH 59/59] Update to 3.0.2 release --- sources | 2 +- xreader.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 652e448..63669c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-3.0.1.tar.gz) = c6bd924dba80849e8d0ed2913cad166fa4f96ac211cf7526719c1198fc8d2bd35c16e8425682130b23b1431db7edd1bcb42aaf7478942c5317f51a7518280801 +SHA512 (xreader-3.0.2.tar.gz) = 659f4b8556e338c8da9f253f6e71e01408f4217c601c5d63c5f8e6b6c7e09f2170fbde50433872b1b4524be3938d5ef1a13a7b05cbb7b7cc337790833f64f319 diff --git a/xreader.spec b/xreader.spec index 5c2ae5a..b68eb19 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} Summary: Simple document viewer @@ -167,6 +167,9 @@ This package adds configuration to use %{name} as a thumbnailer. %doc %{_datadir}/doc/%{name}* %changelog +* Fri Jun 25 2021 Leigh Scott - 3.0.2-1 +- Update to 3.0.2 release + * Thu Jun 10 2021 Leigh Scott - 3.0.1-1 - Update to 3.0.1 release