Notification time stamped 2019-11-30 21:37:48 UTC
From bbdbd9e6e8a9a8ab4ea6c3d6630abc8815c05ea5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter(a)gmail.com>
Date: Nov 30 2019 21:37:41 +0000
Subject: make qt4 conditional, no on el8+ (#1773581)
---
diff --git a/qwt.spec b/qwt.spec
index 8ab5a38..496e8b1 100644
--- a/qwt.spec
+++ b/qwt.spec
@@ -2,13 +2,17 @@
# trim changelog included in binary rpms
%global _changelog_trimtime %(date +%s -d "1 year ago")
+# build qt4 support (or not)
+%if 0%{?rhel} < 8
+%global qt4 1
+%endif
# build qt5 support (or not)
%global qt5 1
Name: qwt
Summary: Qt Widgets for Technical Applications
Version: 6.1.3
-Release: 11%{?dist}
+Release: 12%{?dist}
License: LGPLv2 with exceptions
URL:
http://qwt.sourceforge.net
@@ -31,11 +35,14 @@ BuildRequires: pkgconfig(Qt5Concurrent) pkgconfig(Qt5PrintSupport)
pkgconfig(Qt5
BuildRequires: pkgconfig(Qt5OpenGL) pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Designer)
%endif
+%if 0%{?qt4}
BuildRequires: pkgconfig(QtGui) pkgconfig(QtSvg)
BuildRequires: pkgconfig(QtDesigner)
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%endif
+
# silly buildsys quirk
BuildConflicts: qwt-devel
-%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
Provides: qwt6 = %{version}-%{release}
@@ -99,20 +106,25 @@ pushd %{_target_platform}-qt5
popd
%endif
+%if 0%{?qt4}
mkdir %{_target_platform}
pushd %{_target_platform}
%{qmake_qt4} QWT_CONFIG+=QwtPkgConfig ..
%make_build
popd
+%endif
%install
%if 0%{?qt5}
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-qt5
%endif
+%if 0%{?qt4}
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
+%endif
+%if 0%{?qt4}
# fixup doc path bogosity
mv %{buildroot}%{_qt4_docdir}/html/html \
%{buildroot}%{_qt4_docdir}/html/qwt
@@ -128,8 +140,18 @@ rm -rfv %{buildroot}%{_qt5_docdir}/html/*
cp -alf %{buildroot}%{_qt4_docdir}/html/qwt/ \
%{buildroot}%{_qt5_docdir}/html/qwt/
%endif
+%else
+# fixup doc path bogosity
+mv %{buildroot}%{_qt5_docdir}/html/html \
+ %{buildroot}%{_qt5_docdir}/html/qwt
+
+mkdir -p %{buildroot}%{_mandir}
+mv %{buildroot}%{_qt5_docdir}/html/man/man3 \
+ %{buildroot}%{_mandir}/
+%endif
+%if 0%{?qt4}
%ldconfig_scriptlets
%files
@@ -147,12 +169,15 @@ cp -alf %{buildroot}%{_qt4_docdir}/html/qwt/ \
%{_qt4_libdir}/qt4/mkspecs/features/qwt*
%{_qt4_libdir}/pkgconfig/qwt.pc
%{_qt4_libdir}/pkgconfig/qwtmathml.pc
+%endif
%files doc
+%if 0%{?qt4}
# own these to avoid needless dep on qt/qt-doc
%dir %{_qt4_docdir}
%dir %{_qt4_docdir}/html/
%{_qt4_docdir}/html/qwt/
+%endif
%if 0%{?qt5}
%dir %{_qt5_docdir}
%dir %{_qt5_docdir}/html/
@@ -182,6 +207,9 @@ cp -alf %{buildroot}%{_qt4_docdir}/html/qwt/ \
%changelog
+* Sat Nov 30 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 6.1.3-12
+- make qt4 conditional, no on el8+ (#1773581)
+
* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.1.3-11
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
https://src.fedoraproject.org/rpms/qwt/c/bbdbd9e6e8a9a8ab4ea6c3d6630abc88...