Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

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

.gitignore

@@ -1,2 +1,5 @@
 /qpdfview-0.4.1.tar.gz
 /qpdfview-0.4.15.tar.gz
+/qpdfview-0.4.16.tar.gz
+/qpdfview-0.4.17beta1.tar.gz
+/qpdfview-0.4.18.tar.gz

qpdfview.spec

@@ -1,14 +1,28 @@
+#%%global prerelease beta1
+%global with_qt4 0%{?rhel} && 0%{?rhel} < 8
+%global with_qt5 (0%{?rhel} && 0%{?rhel} >= 8) || 0%{?fedora}
+
+
 Name:		qpdfview
-Version:	0.4.15
-Release:	1%{?dist}
+Version:	0.4.18
+Release:	10%{?dist}
+# Use the following format for beta
+#Release:	0.1.%%{?prerelease}%%{?dist}
 License:	GPLv2+
 Summary:	Tabbed PDF Viewer
 Url:		https://launchpad.net/qpdfview
-Source0:	https://launchpad.net/qpdfview/trunk/%{version}/+download/%{name}-%{version}.tar.gz
-BuildRequires:	desktop-file-utils file-devel cups-devel hicolor-icon-theme pkgconfig(poppler-qt4) pkgconfig(libspectre) pkgconfig(QtGui) pkgconfig(QtDBus) pkgconfig(zlib)
-%if 0%{?centos_version}
-Requires:	qt-sqlite
-%else
+Source0:	https://launchpad.net/qpdfview/trunk/%{version}%{?prerelease}/+download/%{name}-%{version}%{?prerelease}.tar.gz
+Patch0:		%{name}_model.patch
+BuildRequires:	gcc-c++
+BuildRequires:	make
+BuildRequires:	desktop-file-utils
+BuildRequires:	file-devel
+BuildRequires:	cups-devel
+BuildRequires:	hicolor-icon-theme
+BuildRequires:	pkgconfig(libspectre)
+BuildRequires:	pkgconfig(zlib)
+%if 0%{?fedora}
+# check if required for qt4
 BuildRequires:	pkgconfig(ddjvuapi)
 %endif
 
@@ -18,53 +32,234 @@ It uses the Poppler library for rendering and CUPS for printing.
 It provides a clear and simple graphical user interface using the Qt framework.
 
 
+%package common
+Summary:	Common files for %{name}
+BuildArch:	noarch
+
+%description common
+This package provides common files for %{name}.
+
+%if %{with_qt4}
+%package qt4
+Summary:	Tabbed PDF Viewer
+BuildRequires:	pkgconfig(poppler-qt4)
+BuildRequires:	pkgconfig(QtGui)
+BuildRequires:	pkgconfig(QtDBus)
+%if 0%{?rhel}
+Requires:	qt-sqlite
+%endif
+Requires:	%{name}-common = %{version}-%{release}
+Obsoletes:	%{name} < %{version}-%{release}
+
+%description qt4
+qpdfview is a tabbed PDF viewer.
+It uses the Poppler library for rendering and CUPS for printing.
+It provides a clear and simple graphical user interface using the Qt framework.
+%endif
+
+
+%if %{with_qt5}
+%package qt5
+Summary:	Tabbed PDF Viewer
+BuildRequires:	qt5-qttools-devel
+BuildRequires:	pkgconfig(poppler-qt5)
+BuildRequires:	pkgconfig(Qt5DBus)
+BuildRequires:	pkgconfig(Qt5Gui)
+BuildRequires:	pkgconfig(Qt5Svg)
+BuildRequires:	pkgconfig(Qt5Widgets)
+Requires:	%{name}-common = %{version}-%{release}
+%if 0%{?fedora} > 33
+Obsoletes:	%{name} < %{version}-%{release}
+%endif
+
+%description qt5
+qpdfview is a tabbed PDF viewer.
+It uses the Poppler library for rendering and CUPS for printing.
+It provides a clear and simple graphical user interface using the Qt framework.
+%endif
+
+
 %prep
-%setup0 -q
+%setup -qc
+%patch0 -p0
 
 
 %build
+%if %{with_qt4}
+cp -a %{name}-%{version}%{?prerelease} build-qt4
+pushd build-qt4
 lrelease-qt4 qpdfview.pro
-qmake-qt4 \
-    QMAKE_CFLAGS+="%{optflags}" \
-    QMAKE_CXXFLAGS+="%{optflags}" \
-    QMAKE_STRIP="" \
+%{qmake_qt4} \
     PLUGIN_INSTALL_PATH="%{_libdir}/%{name}" \
     DATA_INSTALLPATH="%{_datadir}/%{name}" \
-%if 0%{?centos_version}
+%if 0%{?rhel}
     CONFIG+=without_djvu \
 %endif
     qpdfview.pro
 make %{?_smp_mflags}
+popd
+%endif
+
+%if %{with_qt5} 
+cp -a %{name}-%{version}%{?prerelease} build-qt5
+pushd build-qt5
+lrelease-qt5 qpdfview.pro
+# Some adjustments to avoid conflict with Qt4 package
+sed -i "s/TARGET = qpdfview/TARGET = qpdfview-qt5/g" application.pro
+sed -i "s,DESKTOP_FILE = miscellaneous/qpdfview.desktop,DESKTOP_FILE = miscellaneous/qpdfview-qt5.desktop,g" application.pro
+sed "s/Exec=qpdfview/Exec=qpdfview-qt5/g" miscellaneous/qpdfview.desktop.in  > miscellaneous/qpdfview-qt5.desktop.in
+sed -i "s/Name=qpdfview/Name=qpdfview (Qt5)/g" miscellaneous/qpdfview-qt5.desktop.in
+%{qmake_qt5} \
+    PLUGIN_INSTALL_PATH="%{_libdir}/%{name}-qt5" \
+    DATA_INSTALLPATH="%{_datadir}/%{name}" \
+%if 0%{?rhel}
+    CONFIG+=without_djvu \
+%endif
+    qpdfview.pro
+make %{?_smp_mflags}
+popd
+%endif
 
 
 %install
+%if %{with_qt4} 
+pushd build-qt4
 make INSTALL_ROOT=%{buildroot} install
-install -Dm 0644 icons/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+popd
+%endif
+
+%if %{with_qt5}
+pushd build-qt5
+make INSTALL_ROOT=%{buildroot} install
+popd
+%endif
+
 %find_lang %{name} --with-qt --without-mo
-# unknown language
-rm -f %{buildroot}/%{_datadir}/%{name}/%{name}_ast.qm
+# Common files are equal for both Qt4 and Qt5
+cd %{name}-%{version}%{?prerelease}
+install -Dm 0644 icons/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%if %{with_qt4}
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+%endif
+%if %{with_qt5}
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-qt5.desktop
+%endif
+# unknown language (epel7..9, f34)
+%if 0%{?rhel} || 0%{?fedora} <= 34
+    rm -f %{buildroot}/%{_datadir}/%{name}/%{name}_ast.qm
+%endif
 
 
-%post	-p /sbin/ldconfig
+%if %{with_qt4}
+%ldconfig_scriptlets
+%endif
 
 
-%postun	-p /sbin/ldconfig
+%if %{with_qt5}
+# Scriptlets qt5 subpackage
+%ldconfig_scriptlets qt5
+%endif
 
 
-%files -f %{name}.lang
-%doc CHANGES CONTRIBUTORS COPYING README TODO
+%if %{with_qt4}
+%files qt4
 %{_bindir}/%{name}
-%{_libdir}/%{name}/
+%{_libdir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%endif
+
+%if %{with_qt5}
+%files qt5
+%{_bindir}/%{name}-qt5
+%{_libdir}/%{name}-qt5
+%{_datadir}/applications/%{name}-qt5.desktop
+%endif
+
+%files common -f %{name}.lang
+%license %{name}-%{version}%{?prerelease}/COPYING
+%doc %{name}-%{version}%{?prerelease}/CHANGES %{name}-%{version}%{?prerelease}/CONTRIBUTORS %{name}-%{version}%{?prerelease}/README %{name}-%{version}%{?prerelease}/TODO
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/help*.html
-#{_datadir}/%{name}/%{name}.svg
-%{_datadir}/applications/%{name}.desktop
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_mandir}/man?/*
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.18-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jan 24 2022 TI_Eugene <ti.eugene@gmail.com> - 0.4.18-9
+- EPEL8..9 fix
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.18-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Aug 18 2021 TI_Eugene <ti.eugene@gmail.com> - 0.4.18-8
+- F35 fix
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.18-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.18-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jan 06 2021 TI_Eugene <ti.eugene@gmail.com> - 0.4.18-5
+- Move Qt4 things into qpdfview-qt4 subpackage
+- Disable Qt4 version for F34
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 17 2020 Marek Kasik <mkasik@redhat.com> - 0.4.18-2
+- Rebuild for poppler-0.84.0
+
+* Sat Aug 17 2019 Zamir SUN <sztsian@gmail.com - 0.4.18-1
+- Update to 0.4.18
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.17-0.10.beta1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.17-0.9.beta1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.17-0.8.beta1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Mar 23 2018 Marek Kasik <mkasik@redhat.com> - 0.4.17-0.7.beta1
+- Rebuild for poppler-0.63.0
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.17-0.6.beta1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 0.4.17-0.5.beta1
+- Rebuilt for switch to libxcrypt
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.17-0.4.beta1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.17-0.3.beta1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.17-0.2.beta1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Jan 12 2017 Christian Dersch <lupinix@mailbox.org> - 0.4.17-0.1.beta1
+- new version
+- added Qt5 build
+- added missing scriptlets for icon cache and desktop-database
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Feb 02 2016 Rex Dieter <rdieter@fedoraproject.org> - 0.4.16-2
+- use %%qmake_qt4 macro to ensure proper build flags
+
+* Thu Jan 07 2016 TI_Eugene <ti.eugene@gmail.com> 0.4.16-1
+- Version bump
+
 * Fri Oct 09 2015 TI_Eugene <ti.eugene@gmail.com> 0.4.15-1
 - Version bump
 

qpdfview_model.patch

@@ -0,0 +1,10 @@
+--- qpdfview-0.4.18/sources/model.h.orig	2021-01-06 17:43:35.948007646 +0300
++++ qpdfview-0.4.18/sources/model.h	2021-01-06 17:44:20.809207985 +0300
+@@ -24,6 +24,7 @@
+ #define DOCUMENTMODEL_H
+ 
+ #include <QList>
++#include <QPainterPath>
+ #include <QtPlugin>
+ #include <QWidget>
+ #include <QVector>

sources

@@ -1 +1 @@
-d7e4066f9062a00380e9aa78c12a882e  qpdfview-0.4.15.tar.gz
+SHA512 (qpdfview-0.4.18.tar.gz) = 38741520b20e3ed7100e52982930abac26e994a69df68c54dfa7180be8b2a4f377b91ba03993bab67b0a505ad79d62164f0f168a6715f4306b635ceba6840d66