!5 Upgrade to 3.38.2

From: @weijin-deng
Reviewed-by: @dwl301
Signed-off-by: @dwl301

0001-Resolves-deb-762530-rhbz-1061177-add-man-pages.patch

@@ -1,86 +0,0 @@
-From 8e20f99f5d73175112b37203ba127519db90aff0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Tue, 10 Jan 2017 15:10:44 +0000
-Subject: [PATCH] Resolves: deb#762530 rhbz#1061177 add man pages
-
-for evince-previewer and evince-thumbnailer
----
- data/Makefile.am          |  2 +-
- data/evince-previewer.1   | 24 ++++++++++++++++++++++++
- data/evince-thumbnailer.1 | 20 ++++++++++++++++++++
- 3 files changed, 45 insertions(+), 1 deletion(-)
- create mode 100644 data/evince-previewer.1
- create mode 100644 data/evince-thumbnailer.1
-
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 44fcf33..a45a3cb 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -7,7 +7,7 @@ install-data-local: update-icon-cache
- # man file
- #
- 
--man_MANS=evince.1
-+man_MANS=evince.1 evince-previewer.1 evince-thumbnailer.1
- 
- #
- # UI descriptions
-diff --git a/data/evince-previewer.1 b/data/evince-previewer.1
-new file mode 100644
-index 0000000..1841509
---- /dev/null
-+++ b/data/evince-previewer.1
-@@ -0,0 +1,24 @@
-+.TH evince\-previewer 1 2015\-07\-28
-+.SH NAME
-+evince\-previewer \- show a printing preview of PostScript and PDF documents
-+.SH SYNOPSIS
-+\fBevince\-previewer\fR [options] \fBinput\fR
-+.SH DESCRIPTION
-+evince\-previewer is a GNOME program to
-+show a printing preview from PostScript (PS), Portable Document Format
-+(PDF), DjVu and DVI files.
-+.SH OPTIONS
-+evince\-previewer obeys all normal GNOME and GTK+ command line options.
-+The application options are
-+.TP
-+\fB\-u, \-\-unlink\-tempfile\fR
-+Delete the temporary file
-+.TP
-+\fB\-p, \-\-print-settings=FILE\fR
-+Print settings file
-+.SH "SEE ALSO"
-+\fBevince\fR(1),
-+\fBgnome\-options\fR(7),
-+\fBgtk\-options\fR(7).
-+.PP
-+https://wiki.gnome.org/Apps/Evince
-diff --git a/data/evince-thumbnailer.1 b/data/evince-thumbnailer.1
-new file mode 100644
-index 0000000..25ddfec
---- /dev/null
-+++ b/data/evince-thumbnailer.1
-@@ -0,0 +1,20 @@
-+.TH evince\-thumbnailer 1 2007\-01\-15  
-+.SH NAME
-+evince\-thumbnailer \- create png thumbnails from PostScript and PDF documents
-+.SH SYNOPSIS
-+\fBevince\-thumbnailer\fR [\-s \fBsize\fR] \fBinput\fR \fBoutput\fR 
-+.SH DESCRIPTION
-+evince\-thumbnailer is a GNOME program to
-+create thumbnails from PostScript (PS), Portable Document Format
-+(PDF), DjVu and DVI files.
-+.SH OPTIONS
-+evince obeys all normal GNOME and GTK+ 
-+command line options. The only option \-s \fIsize
-+\fRmakes it possible to choose the vertical size
-+of the created thumbnail.
-+.SH "SEE ALSO"
-+\fBevince\fR(1),
-+\fBgnome\-options\fR(7),
-+\fBgtk\-options\fR(7).
-+.PP
-+http://www.gnome.org/projects/evince/
--- 
-2.9.3
-

evince.spec

@@ -1,22 +1,22 @@
 Name:           evince
-Version:        3.30.1
+Version:        3.38.2
-Release:        4
+Release:        1
 Summary:        Document viewer for multiple document formats
 License:        GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse
 URL:            https://wiki.gnome.org/Apps/Evince
-Source0:        https://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz
 Patch0:         evince-3.21.4-NPNVToolKit.patch
-Patch1:         0001-Resolves-deb-762530-rhbz-1061177-add-man-pages.patch
 
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.36.0 pkgconfig(gtk+-x11-3.0) >= 3.16.0 pkgconfig(gnome-desktop-3.0)
-BuildRequires:  pkgconfig(poppler-glib) >= 0.24.0 pkgconfig(libgxps) >= 0.2.1       pkgconfig(gobject-introspection-1.0)
+BuildRequires:  pkgconfig(poppler-glib) >= 0.33.0 pkgconfig(libgxps) >= 0.2.1       pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(libnautilus-extension) pkgconfig(libxml-2.0)  pkgconfig(gspell-1)   pkgconfig(libspectre)
-BuildRequires:  pkgconfig(adwaita-icon-theme)    pkgconfig(libsecret-1) pkgconfig(libarchive) libappstream-glib
+BuildRequires:  pkgconfig(adwaita-icon-theme)    pkgconfig(libsecret-1) pkgconfig(libarchive) libappstream-glib-devel
-BuildRequires:  desktop-file-utils itstool libtool gtk-doc texlive-lib-devel
+BuildRequires:  pkgconfig(gstreamer-1.0) pkgconfig(gstreamer-base-1.0) pkgconfig(gstreamer-video-1.0) pkgconfig(synctex) >= 1.19
-BuildRequires:  gnome-common intltool gettext gcc-c++ libtiff-devel yelp-tools
+BuildRequires:  desktop-file-utils itstool libtool gtk-doc texlive-lib-devel meson djvulibre-devel
+BuildRequires:  gnome-common intltool gettext-devel gcc-c++ libtiff-devel yelp-tools gcc
 Provides:       evince-libs evince-dvi evince-nautilus
 Obsoletes:      evince-libs evince-dvi evince-nautilus
-Requires:       glib2%{?_isa} >= 2.36.0 gtk3%{?_isa} >= 3.16.0 texlive-collection-fontsrecommended nautilus
+Requires:       glib2%{?_isa} >= 2.36.0 gtk3%{?_isa} >= 3.22.0 texlive-collection-fontsrecommended nautilus
 
 %description
 Evince is a document viewer for multiple document formats. The goal of evince is to replace the
@@ -41,14 +41,16 @@ This package contain the help documents for evince.
 %autosetup -n %{name}-%{version} -p1
 
 %build
-export SYNCTEX_CFLAGS=-I/usr/include/synctex
+export CFLAGS='-I%{_builddir}/%{name}-%{version}/cut-n-paste/synctex %optflags'
-autoreconf -f -i
+#export CFLAGS='-I/usr/include/synctex %optflags'
-%configure --disable-static --enable-introspection --enable-comics=yes --enable-dvi=yes \
+%meson -Dcomics=enabled -Ddvi=enabled -Ddjvu=enabled -Dxps=enabled \
-           --enable-libgnome-desktop --enable-xps=yes --enable-t1lib=no --enable-ps=yes
+        -Dt1lib=disabled -Dsystemduserunitdir=no -Dnautilus=false \
-%make_build V=1 
+	-Dps=enabled
+
+%meson_build
 
 %install
-%make_install
+%meson_install
 %find_lang evince --with-gnome
 
 install -d $RPM_BUILD_ROOT%{_datadir}/applications
@@ -56,6 +58,7 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -name '*.la' -print -delete
 find $RPM_BUILD_ROOT%{_libdir} -type f -name '*.a' -print -delete
 
 %check
+appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Evince.appdata.xml
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-previewer.desktop
 
@@ -75,14 +78,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
 %{_datadir}/metainfo/org.gnome.Evince.appdata.xml
 %{_datadir}/thumbnailers/evince.thumbnailer
 %{_libexecdir}/evinced
-%{_userunitdir}/org.gnome.Evince.service
 %{_libdir}/*.so.*
 %dir %{_libdir}/evince
 %dir %{_libdir}/evince/4
 %dir %{_libdir}/evince/4/backends
 %{_libdir}/evince/4/backends/*.so
 %{_libdir}/evince/4/backends/*.evince-backend
-%{_libdir}/nautilus/extensions-3.0/libevince-properties-page.so
 %{_libdir}/girepository-1.0/*.typelib
 %{_datadir}/metainfo/*.metainfo.xml
 
@@ -102,6 +103,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
 
 
 %changelog
+* Tue Jun 15 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.2-1
+- Upgrade to 3.38.2
+- Delete 0001-Resolves-deb-762530-rhbz-1061177-add-man-pages.patch that
+  existed in 3.38.2 version
+- Use meson rebuild, change 'SYNCTEX_CFLAGS' to 'CFLAGS'
+
 * Mon Jun 8 2020 yanan li <liyanan032@huawei.com> - 3.30.1-4
 - Disable designated LIBTOOL directory in %make_build