Update to 3.4.5 release

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

sources

@@ -1 +1 @@
-SHA512 (xreader-1.6.2.tar.gz) = f32d8113a93a82da51e711c983ba0a720edc012f14b977adb0227b1531cb0ae1a6ab3809c4199233ed9b6d185cdfc038af55f68bec1d2ac252d9bb1859209a0c
+SHA512 (xreader-3.4.5.tar.gz) = f7097e38127707f8072eacd9d072c5580dbbca1a8369a931d37c8fee2edb8a7f30dbbbd0acaf2f67c14c2dda6733163639eeb7d8cc1d5cc47005bd2e2a106373

xreader.spec

@@ -1,24 +1,21 @@
 # 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
+Version:	3.4.5
 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:	gnome-common
+ExcludeArch:    %{ix86}
+
+BuildRequires:	cmake
+BuildRequires:	gcc-c++
+BuildRequires:	meson
+BuildRequires:	mathjax
 BuildRequires:	gtk-doc
 BuildRequires:	intltool
 BuildRequires:	itstool
@@ -29,50 +26,44 @@ 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)
-%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}
 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.4.0
 BuildRequires:	pkgconfig(zlib)
 BuildRequires:	pkgconfig(webkit2gtk-4.0)
 BuildRequires:	texlive
+BuildRequires:	t1lib-devel
 BuildRequires:	yelp-tools
 
 Requires:	shared-mime-info%{?_isa}
 Requires:	gsettings-desktop-schemas%{?_isa}
 Requires:	xapps%{?_isa}
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
-%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
 
 %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 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}.
@@ -80,165 +71,244 @@ 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 data
+Summary: Support files for the %{name} document viewer
+BuildArch: noarch
 
-%package -n nemo-extension-%{name}
-Summary:	X-Apps Document Reader file manager extension
+%description data
+This package contains icons and other support files used by the
+%{name} application and libraries.
 
-Requires:	nemo
-Requires:	%{name}%{?_isa}				== %{version}-%{release}
+%package thumbnailer
+Summary: System thumbnailer using %{name} libraries
+Requires: %{name}-libs%{?_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}
+%description thumbnailer
+This package adds configuration to use %{name} as a thumbnailer.
 
 
 %prep
-%autosetup -p 1
-NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh
-
+%autosetup -p1
 
 %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			\
-		--enable-pixbuf
-
-%make_build
+%meson	\
+ -Ddeprecated_warnings=false \
+ -Ddjvu=true \
+ -Ddvi=true \
+ -Dt1lib=true \
+ -Dpixbuf=true \
+ -Dcomics=true \
+ -Dintrospection=true \
+ -Dhelp_files=true
 
+%meson_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 '/.*<project_group>.*/d'			\
-	%{buildroot}%{_datadir}/appdata/*.appdata.xml
-%find_lang %{name}
+%meson_install
 
+%{__sed} -i -e '/.*<project_group>.*/d' \
+	%{buildroot}%{_metainfodir}/%{name}.appdata.xml
+
+%find_lang %{name}
 
 %check
 # Validate desktop-files.
-%{_bindir}/desktop-file-validate				\
-	%{buildroot}%{_datadir}/applications/*.desktop
+%{_bindir}/desktop-file-validate    \
+	%{buildroot}%{_datadir}/applications/%{name}.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 || :
-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)
+%{_bindir}/appstream-util validate-relax --nonet    \
+	%{buildroot}%{_metainfodir}/%{name}.appdata.xml
 
+%ldconfig_scriptlets
 
 %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
+%{_metainfodir}/%{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
+%{_libexecdir}/xreaderd
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/%{name}-previewer.1*
+
+%files libs
 %{_libdir}/girepository-1.0/*
 %{_libdir}/*.so.*
-%{_libdir}/%{name}
-%{_libexecdir}/%{name}*
-%{_mandir}/man?/*.*
+%{_libdir}/%{name}/
 
+%files data
+%{_datadir}/%{name}/
+
+%files thumbnailer
+%{_bindir}/%{name}-thumbnailer
+%{_datadir}/thumbnailers/%{name}.thumbnailer
+%{_mandir}/man1/%{name}-thumbnailer.1*
 
 %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
 
-
 %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
-
-
-%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
+* Sun Aug 21 2022 Leigh Scott <leigh123linux@gmail.com> - 3.4.5-1
+- Update to 3.4.5 release
+
+* Sun Jul 24 2022 Leigh Scott <leigh123linux@gmail.com> - 3.4.3-1
+- Update to 3.4.3 release
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jul 20 2022 Leigh Scott <leigh123linux@gmail.com> - 3.4.2-1
+- Update to 3.4.2 release
+
+* Sun Jul 17 2022 Leigh Scott <leigh123linux@gmail.com> - 3.4.1-1
+- Update to 3.4.1 release
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Dec 06 2021 Leigh Scott <leigh123linux@gmail.com> - 3.2.2-1
+- Update to 3.2.2 release
+
+* Mon Nov 29 2021 Leigh Scott <leigh123linux@gmail.com> - 3.2.1-1
+- Update to 3.2.1 release
+
+* Wed Nov 24 2021 Leigh Scott <leigh123linux@gmail.com> - 3.2.0-1
+- Update to 3.2.0 release
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 25 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.2-1
+- Update to 3.0.2 release
+
+* Thu Jun 10 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.1-1
+- Update to 3.0.1 release
+
+* Tue Jun 01 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.0-1
+- Update to 3.0.0 release
+
+* Sun Feb 28 2021 FeRD (Frank Dana) <ferdnyc@gmail.com> - 2.8.3-3
+- Create subpackages for libs, data, and thumbnailer (rhbz#1933895)
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jan 13 2021 Leigh Scott <leigh123linux@gmail.com> - 2.8.3-1
+- Update to 2.8.3 release
+
+* Sat Jan  2 2021 Leigh Scott <leigh123linux@gmail.com> - 2.8.2-1
+- Update to 2.8.2 release
+
+* Thu Dec 10 2020 Leigh Scott <leigh123linux@gmail.com> - 2.8.1-1
+- Update to 2.8.1 release
+
+* Wed Dec  2 2020 Leigh Scott <leigh123linux@gmail.com> - 2.8.0-1
+- Update to 2.8.0 release
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 14 2020 Leigh Scott <leigh123linux@gmail.com> - 2.6.4-1
+- Update to 2.6.4 release
+
+* Sat Jun 06 2020 Leigh Scott <leigh123linux@gmail.com> - 2.6.2-1
+- Update to 2.6.2 release
+
+* Sat May 23 2020 Leigh Scott <leigh123linux@gmail.com> - 2.6.1-1
+- Update to 2.6.1 release
+
+* Tue May 12 2020 Leigh Scott <leigh123linux@gmail.com> - 2.6.0-1
+- Update to 2.6.0 release
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 17 2020 Marek Kasik <mkasik@redhat.com> - 2.4.4-3
+- Rebuild for poppler-0.84.0
+
+* Fri Jan 10 2020 Leigh Scott <leigh123linux@gmail.com> - 2.4.4-2
+- Add build requires t1lib-devel
+
+* Fri Jan 10 2020 Leigh Scott <leigh123linux@googlemail.com> - 2.4.4-1
+- Update to 2.4.4 release
+
+* Wed Dec 11 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.4.3-1
+- Update to 2.4.3 release
+
+* Thu Nov 28 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.4.2-1
+- Update to 2.4.2 release
+
+* Tue Nov 26 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.4.1-1
+- Update to 2.4.1 release
+
+* Fri Nov 22 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.4.0-1
+- Update to 2.4.0 release
+
+* Tue Sep 10 2019 Florian Weimer <fweimer@redhat.com> - 2.2.3-2
+- Fix building in C99 mode
+
+* Wed Jul 31 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.2.3-1
+- Update to 2.2.3 release
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Jul 14 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.2.2-1
+- Update to 2.2.2 release
+
+* Sun Jun 30 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.2.1-1
+- Update to 2.2.1 release
+
+* Sat Jun 29 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.2.0-1
+- Update to 2.2.0 release
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sun Dec 16 2018 Leigh Scott <leigh123linux@googlemail.com> - 2.0.2-1
+- Update to 2.0.2 release
+
+* Wed Nov 28 2018 Leigh Scott <leigh123linux@googlemail.com> - 2.0.1-1
+- Update to 2.0.1 release
+
+* Mon Nov 19 2018 Leigh Scott <leigh123linux@googlemail.com> - 2.0.0-1
+- Update to 2.0.0 release
+
+* Wed Aug 15 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.8.5-1
+- Update to 1.8.5 release
+
+* Mon Jul 16 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.8.4-1
+- Update to 1.8.4 release
+- Add BuildRequires gcc-c++
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu May 10 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.8.1-1
+- Update to 1.8.1 release
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Mon Dec 18 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.6.2-1
 - New upstream release