Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/poppler.git#c9fc8233b10a222046e3f1445915efb2e74d6a10

poppler.spec

@@ -4,7 +4,7 @@
 Summary: PDF rendering library
 Name:    poppler
 Version: 0.90.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz
@@ -13,17 +13,22 @@ Source1: %{name}-test-%{test_date}-%{test_sha}.tar.xz
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1185007
 Patch0:  poppler-0.30.0-rotated-words-selection.patch
+
+%if 0%{?fedora}
 Patch1:  0001-Revert-Remove-the-Qt4-frontend.patch
 
 Patch3:  poppler-0.67.0-qt4-const.patch
+%endif
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1696636
 Patch4:  poppler-0.73.0-PSOutputDev-buffer-read.patch
 
 Patch5:  poppler-0.84.0-MacroPushRequiredVars.patch
 
+%if 0%{?fedora}
 # https://bugzilla.redhat.com/show_bug.cgi?id=1673727
 Patch6:  poppler-0.90.0-qt4-update.patch
+%endif
 
 Patch7:  poppler-0.90.0-position-independent-code.patch
 
@@ -58,10 +63,12 @@ BuildRequires: pkgconfig(Qt5Gui)
 BuildRequires: pkgconfig(Qt5Test)
 BuildRequires: pkgconfig(Qt5Widgets)
 BuildRequires: pkgconfig(Qt5Xml)
+%if 0%{?fedora}
 BuildRequires: pkgconfig(QtCore)
 BuildRequires: pkgconfig(QtGui)
 BuildRequires: pkgconfig(QtTest)
 BuildRequires: pkgconfig(QtXml)
+%endif
 
 Requires: poppler-data
 
@@ -101,6 +108,7 @@ BuildArch: noarch
 %description glib-doc
 %{summary}.
 
+%if 0%{?fedora}
 %package qt
 Summary: Qt4 wrapper for poppler
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -119,6 +127,7 @@ Provides:  poppler-qt4-devel = %{version}-%{release}
 Requires: qt4-devel
 %description qt-devel
 %{summary}.
+%endif
 
 %package qt5
 Summary: Qt5 wrapper for poppler
@@ -182,7 +191,9 @@ test "$(pkg-config --modversion poppler)" = "%{version}"
 test "$(pkg-config --modversion poppler-cairo)" = "%{version}"
 test "$(pkg-config --modversion poppler-cpp)" = "%{version}"
 test "$(pkg-config --modversion poppler-glib)" = "%{version}"
+%if 0%{?fedora}
 test "$(pkg-config --modversion poppler-qt4)" = "%{version}"
+%endif
 test "$(pkg-config --modversion poppler-qt5)" = "%{version}"
 test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
@@ -190,7 +201,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
 %ldconfig_scriptlets glib
 
+%if 0%{?fedora}
 %ldconfig_scriptlets qt
+%endif
 
 %ldconfig_scriptlets qt5
 
@@ -227,6 +240,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 %license COPYING
 %{_datadir}/gtk-doc/
 
+%if 0%{?fedora}
 %files qt
 %{_libdir}/libpoppler-qt4.so.4*
 
@@ -234,6 +248,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 %{_libdir}/libpoppler-qt4.so
 %{_libdir}/pkgconfig/poppler-qt4.pc
 %{_includedir}/poppler/qt4/
+%endif
 
 %files qt5
 %{_libdir}/libpoppler-qt5.so.1*
@@ -256,6 +271,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 %{_mandir}/man1/*
 
 %changelog
+* Mon Dec 07 2020 Marek Kasik <mkasik@redhat.com> - 0.90.0-8
+- Build Qt4 frontend on Fedora only
+
 * Sat Oct 31 2020 Jeff Law <law@redhat.com> - 0.90.0-7
 - Fix bogus volatiles caught by gcc-11