import qt5-5.12.5-3.el8

This commit is contained in:
CentOS Sources 2020-04-28 04:53:43 -04:00 committed by Andrew Lukoshko
parent ec2c3c0719
commit 90dc5b8ee8
3 changed files with 26 additions and 22 deletions

View File

@ -1,9 +1,9 @@
%_qt5_prefix %{_libdir}/qt5 %_qt5_prefix %{_prefix}
%_qt5_archdatadir %{_libdir}/qt5 %_qt5_archdatadir %{_libdir}/qt5
%_qt5_bindir %{_libdir}/qt5/bin %_qt5_bindir %{_libdir}/qt5/bin
%_qt5_datadir %{_datadir}/qt5 %_qt5_datadir %{_datadir}/qt5
%_qt5_docdir %{_docdir}/qt5 %_qt5_docdir %{_docdir}/qt5
%_qt5_examplesdir %{_qt5_prefix}/examples %_qt5_examplesdir %{_qt5_archdatadir}/examples
%_qt5_headerdir %{_includedir}/qt5 %_qt5_headerdir %{_includedir}/qt5
%_qt5_includedir %{_includedir}/qt5 %_qt5_includedir %{_includedir}/qt5
%_qt5_importdir %{_qt5_archdatadir}/imports %_qt5_importdir %{_qt5_archdatadir}/imports
@ -11,7 +11,7 @@
%_qt5_libexecdir %{_qt5_archdatadir}/libexec %_qt5_libexecdir %{_qt5_archdatadir}/libexec
%_qt5_plugindir %{_qt5_archdatadir}/plugins %_qt5_plugindir %{_qt5_archdatadir}/plugins
%_qt5_qmldir %{_qt5_archdatadir}/qml %_qt5_qmldir %{_qt5_archdatadir}/qml
%_qt5_qmake %{_qt5_bindir}/qmake %_qt5_qmake @@QMAKE@@
%_qt5_settingsdir %{_sysconfdir}/xdg %_qt5_settingsdir %{_sysconfdir}/xdg
%_qt5_sysconfdir %{_qt5_settingsdir} %_qt5_sysconfdir %{_qt5_settingsdir}
%_qt5_translationdir %{_datadir}/qt5/translations %_qt5_translationdir %{_datadir}/qt5/translations
@ -32,4 +32,4 @@
%qmake_qt5 %{_qt5_qmake} %{?_qt5_qmake_flags} %qmake_qt5 %{_qt5_qmake} %{?_qt5_qmake_flags}
%qmake_qt5_wrapper %{_bindir}/qmake-qt5.sh %qmake_qt5_wrapper @@QMAKE_QT5_WRAPPER@@

View File

@ -1,9 +0,0 @@
# # the architectures theoretically supported by the version of V8 used (#1298011)
# # You may need some minor patching to build on one of the secondary
# # architectures, e.g., to add to the Qt -> Chromium -> V8 arch translations.
# # If you cannot get this package to build on your secondary architecure, please:
# # * remove your architecture from this list AND
# # * put #1298011 onto your ExcludeArch tracker.
%qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el

View File

@ -1,13 +1,12 @@
Name: qt5 Name: qt5
Version: 5.11.1 Version: 5.12.5
Release: 2%{?dist} Release: 3%{?dist}
Summary: Qt5 meta package Summary: Qt5 meta package
License: GPLv3 License: GPLv3
URL: https://getfedora.org/ URL: https://getfedora.org/
Source0: macros.qt5 Source0: macros.qt5
Source1: macros.qt5-srpm Source1: qmake-qt5.sh
Source2: qmake-qt5.sh
BuildArch: noarch BuildArch: noarch
Requires: qt5-qdbusviewer Requires: qt5-qdbusviewer
@ -97,21 +96,24 @@ Summary: RPM macros for source Qt5 packages
%description srpm-macros %description srpm-macros
%{summary}. %{summary}.
%install %install
install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5 install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5
install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5-srpm install -Dpm755 %{SOURCE1} %{buildroot}%{_bindir}/qmake-qt5.sh
install -Dpm755 %{SOURCE2} %{buildroot}%{_bindir}/qmake-qt5.sh
mkdir -p %{buildroot}%{_datadir}/qt5/wrappers 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-qt5
ln -s %{_bindir}/qmake-qt5.sh %{buildroot}%{_datadir}/qt5/wrappers/qmake 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 \ sed -i \
-e "s|@@QT5_CFLAGS@@|%{?qt5_cflags}|g" \ -e "s|@@QT5_CFLAGS@@|%{?qt5_cflags}|g" \
-e "s|@@QT5_CXXFLAGS@@|%{?qt5_cxxflags}|g" \ -e "s|@@QT5_CXXFLAGS@@|%{?qt5_cxxflags}|g" \
-e "s|@@QT5_RPM_LD_FLAGS@@|%{?qt5_rpm_ld_flags}|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|@@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 %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5
mkdir -p %{buildroot}%{_docdir}/qt5 mkdir -p %{buildroot}%{_docdir}/qt5
@ -131,10 +133,21 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
%{_datadir}/qt5/wrappers/ %{_datadir}/qt5/wrappers/
%files srpm-macros %files srpm-macros
%{_rpmconfigdir}/macros.d/macros.qt5-srpm
%changelog %changelog
* Tue Oct 29 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-3
- Re-add srpm macros, just leave them empty
Resolves: bz#1733133
* Tue Oct 29 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-2
- Drop srpm macros as we don't ship qtwebengine
Resolves: bz#1733133
* Tue Oct 29 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
- 5.12.5 + sync with Fedora
Resolves: bz#1733133
* Mon Jul 09 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-2 * Mon Jul 09 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-2
- drop dependency on qt5-qtenginio - drop dependency on qt5-qtenginio