5.15.2

Reset release number
5.15.1
2020-11-20 08:56:12 +01:00 · 2020-09-10 18:11:44 +02:00 · 2020-09-10 18:07:30 +02:00 · 2020-08-19 20:43:34 +00:00 · 2020-08-19 20:03:52 +00:00 · 2020-08-19 19:58:50 +00:00
2 changed files with 82 additions and 11 deletions
--- a/macros.qt5
+++ b/macros.qt5
@ -1,9 +1,9 @@
-%_qt5_prefix %{_libdir}/qt5
+%_qt5_prefix %{_prefix}
 %_qt5_archdatadir %{_libdir}/qt5
 %_qt5_bindir %{_libdir}/qt5/bin
 %_qt5_datadir %{_datadir}/qt5
 %_qt5_docdir %{_docdir}/qt5
-%_qt5_examplesdir %{_qt5_prefix}/examples
+%_qt5_examplesdir %{_qt5_archdatadir}/examples
 %_qt5_headerdir %{_includedir}/qt5
 %_qt5_includedir %{_includedir}/qt5
 %_qt5_importdir %{_qt5_archdatadir}/imports
@ -11,7 +11,7 @@
 %_qt5_libexecdir %{_qt5_archdatadir}/libexec
 %_qt5_plugindir %{_qt5_archdatadir}/plugins
 %_qt5_qmldir %{_qt5_archdatadir}/qml
-%_qt5_qmake %{_qt5_bindir}/qmake
+%_qt5_qmake @@QMAKE@@
 %_qt5_settingsdir %{_sysconfdir}/xdg
 %_qt5_sysconfdir %{_qt5_settingsdir}
 %_qt5_translationdir %{_datadir}/qt5/translations
@ -32,4 +32,4 @@

 %qmake_qt5 %{_qt5_qmake} %{?_qt5_qmake_flags}

-%qmake_qt5_wrapper %{_bindir}/qmake-qt5.sh
+%qmake_qt5_wrapper @@QMAKE_QT5_WRAPPER@@
--- a/qt5.spec
+++ b/qt5.spec
@ -1,6 +1,11 @@
+# include qt5,qt5-devel metapackages or not
+# dropped for f32+
+%if 0%{?fedora} < 32
+%global metapackage 1
+%endif

 Name: qt5
-Version: 5.11.1
+Version: 5.15.2
 Release: 1%{?dist}
 Summary: Qt5 meta package
 License: GPLv3
@ -35,7 +40,6 @@ Requires: qt5-qtwebchannel
 ## qtwebengine is not available on all archs, omit for now
 ## else, need to make qt5 arch'd and deps conditional (on arch)
 #Requires: qt5-qtwebengine
-Requires: qt5-qtwebkit
 Requires: qt5-qtwebsockets
 Requires: qt5-qtx11extras
 Requires: qt5-qtxmlpatterns
@ -57,7 +61,6 @@ Requires: qt5-qt3d-devel
 Requires: qt5-qtbase-devel
 Requires: qt5-qtconnectivity-devel
 Requires: qt5-qtdeclarative-devel
-Requires: qt5-qtenginio-devel
 Requires: qt5-qtlocation-devel
 Requires: qt5-qtmultimedia-devel
 Requires: qt5-qtscript-devel
@ -68,7 +71,6 @@ Requires: qt5-qttools-devel
 Requires: qt5-qtwayland-devel
 Requires: qt5-qtwebchannel-devel
 #Requires: qt5-qtwebengine-devel
-Requires: qt5-qtwebkit-devel
 Requires: qt5-qtwebsockets-devel
 Requires: qt5-qtx11extras-devel
 Requires: qt5-qtxmlpatterns-devel
@ -79,10 +81,10 @@ Requires: qt5-qtxmlpatterns-devel
 %package rpm-macros
 Summary: RPM macros for building Qt5 and KDE Frameworks 5 packages
 Conflicts: qt5-qtbase-devel < 5.6.0-0.23
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Requires: cmake >= 3
 %endif
-%if 0%{?epel}
+%if 0%{?rhel} && 0%{?rhel} < 8
 Requires: cmake3
 %endif
 Requires: gcc-c++
@ -103,14 +105,20 @@ mkdir -p %{buildroot}%{_datadir}/qt5/wrappers
 ln -s %{_bindir}/qmake-qt5.sh %{buildroot}%{_datadir}/qt5/wrappers/qmake-qt5
 ln -s %{_bindir}/qmake-qt5.sh %{buildroot}%{_datadir}/qt5/wrappers/qmake

-# substitute custom flags
+# substitute custom flags, and the path to binaries: binaries referenced from
+# macros should not change if an application is built with a different prefix.
+# %_libdir is left as /usr/%{_lib} (e.g.) so that the resulting macros are
+# architecture independent, and don't hardcode /usr/lib or /usr/lib64.
 sed -i \
  -e "s|@@QT5_CFLAGS@@|%{?qt5_cflags}|g" \
  -e "s|@@QT5_CXXFLAGS@@|%{?qt5_cxxflags}|g" \
  -e "s|@@QT5_RPM_LD_FLAGS@@|%{?qt5_rpm_ld_flags}|g" \
  -e "s|@@QT5_RPM_OPT_FLAGS@@|%{?qt5_rpm_opt_flags}|g" \
+  -e "s|@@QMAKE@@|%{_prefix}/%%{_lib}/qt5/bin/qmake|g" \
+  -e "s|@@QMAKE_QT5_WRAPPER@@|%{_bindir}/qmake-qt5.sh|g" \
  %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5

+%if 0%{?metapackage}
 mkdir -p %{buildroot}%{_docdir}/qt5
 mkdir -p %{buildroot}%{_docdir}/qt5-devel
 echo "- Qt5 meta package" > %{buildroot}%{_docdir}/qt5/README
@ -121,6 +129,7 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README

 %files devel
 %{_docdir}/qt5-devel/README
+%endif

 %files rpm-macros
 %{_rpmconfigdir}/macros.d/macros.qt5
@ -132,6 +141,68 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README


 %changelog
+* Fri Nov 20 08:56:04 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
+- 5.15.2
+
+* Thu Sep 10 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1
+- 5.15.1
+
+* Wed Aug 19 2020 Troy Dawson <tdawson@redhat.com> - 5.14.2-5
+- fix rpm-macros for RHEL builds
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Apr 06 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-3
+- drop qt5,qt5-devel metapackages f32+
+
+* Mon Apr 06 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-2
+- qt5-devel: drop R: qt5-qtenginio-devel
+
+* Sat Apr 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-1
+- 5.14.2
+- drop qt5-qtwebkit from metapackage (hasn't been a core qt5 pkg for awhile)
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-1
+- 5.13.2
+
+* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
+- 5.12.5
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jun 11 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-1
+- 5.12.4
+
+* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
+- 5.12.3
+
+* Thu Feb 14 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-1
+- 5.12.1
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Dec 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-1
+- 5.11.3
+
+* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.2-1
+- 5.11.2
+
+* Tue Aug 21 2018 Owen Taylor <otaylor@redhat.com> - 5.11.1-4
+- rpm-macros: always refer to binaries in their installed location, even if %%_libdir
+  and %%_bindir are redefined.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 29 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-2
+- %%_qt5_prefix=%%_prefix (was %%_libdir/qt5}
+
 * Tue Jun 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
 - 5.11.1
Author	SHA1	Message	Date
Jan Grulich	c545ff7cec	5.15.2	2020-11-20 08:56:12 +01:00
Jan Grulich	89f9ce4200	Reset release number	2020-09-10 18:11:44 +02:00
Jan Grulich	f909adfb69	5.15.1	2020-09-10 18:07:30 +02:00
Troy Dawson	0658ed3bcb	fix rpm-macros for RHEL builds	2020-08-19 20:43:34 +00:00
Troy Dawson	097ae318f4	rpm-macros always requires cmake	2020-08-19 20:03:52 +00:00
Troy Dawson	917b8b814f	Fix for RHEL builds With the previous settings, qt5-rpm-macros built on RHEL do no require cmake, and thus do not get cmake-rpm-macros. Although the qt5 packages build, they do not get all regular provides that packages are expecting. Also, there is no qt5 epel build, so that wasn't necessary.	2020-08-19 19:58:50 +00:00
Fedora Release Engineering	fe6f9f0485	- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-07-29 05:09:42 +00:00
Rex Dieter	bafb463e80	drop qt5,qt5-devel metapackages f32+	2020-04-06 10:49:06 -05:00
Rex Dieter	c1b31cce5c	qt5-devel: drop R: qt5-qtenginio-devel	2020-04-06 10:34:18 -05:00
Rex Dieter	bed052ba24	qt5-qtwebkit-devel too	2020-04-04 17:00:05 -05:00
Rex Dieter	f4e71e5237	drop qt5-qtwebkit from metapackage (hasn't been a core qt5 pkg for awhile)	2020-04-04 16:59:40 -05:00
Rex Dieter	9fb0259ef9	5.14.2	2020-04-04 16:35:43 -05:00
Fedora Release Engineering	36f8051308	- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-01-30 16:53:17 +00:00
Jan Grulich	8cbcfd64b3	5.13.2	2019-12-09 10:58:54 +01:00
Jan Grulich	e680d3b8fc	5.12.5	2019-09-24 13:00:10 +02:00
Fedora Release Engineering	85e9237c26	- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-07-26 17:46:34 +00:00
Jan Grulich	311f389687	5.12.4	2019-06-14 08:42:35 +02:00
Jan Grulich	dc2c32c578	5.12.3	2019-06-04 13:31:11 +02:00
Rex Dieter	ae57eb062e	5.12.1	2019-02-14 16:11:54 -06:00
Fedora Release Engineering	2379dcb706	- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-02-02 10:41:05 +00:00
Rex Dieter	b01b86bb5b	5.11.3	2018-12-07 12:49:42 -06:00
Jan Grulich	3a5d17ab95	5.11.2	2018-09-21 11:29:36 +02:00
Owen W. Taylor	e64f07eb0b	rpm-macros: always refer to binaries in their installed location Even if %_libdir and %_bindir are redefined to, for example, when building Flatpaks, /app/lib64 and /app/bin, we still want to look for qmake and qmake-qt5.sh in their installed locations.	2018-08-21 15:07:13 -04:00
Fedora Release Engineering	fa28d75f17	- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-07-14 03:07:30 +00:00
Rex Dieter	45b9234adc	%_qt5_prefix=%_prefix (was %_libdir/qt5} At least a few code bases (cough kf5 cough) make an educated guess about system Qt if prefix=/usr, so let's ablige them.	2018-06-29 13:36:27 -05:00