From 1f7cc1d73a43c144e73984f1dd3e078029118962 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 1 Feb 2021 09:24:30 +0000 Subject: [PATCH] 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/qt5-qtbase.git#ca6fb1879d00c1f4cc78f3f0017d29baa2e4c0a8 --- qt5-qtbase.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index d18895f..f59aa19 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -16,6 +16,9 @@ %global no_feature_statx -no-feature-statx %global no_feature_renameat2 -no-feature-renameat2 %endif +%if 0%{?rhel} && 0%{?rhel} > 6 +%global no_feature_getentropy -no-feature-getentropy +%endif # support qtchooser (adds qtchooser .conf file) %global qtchooser 1 @@ -52,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.15.2 -Release: 8%{?dist} +Release: 9%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -496,6 +499,7 @@ export MAKEFLAGS="%{?_smp_mflags}" -no-feature-relocatable \ %{?no_feature_renameat2} \ %{?no_feature_statx} \ + %{?no_feature_getentropy} \ QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \ QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \ QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}" @@ -1052,6 +1056,9 @@ fi %changelog +* Mon Feb 01 2021 Jan Grulich - 5.15.2-9 +- Disable getentropy on RHEL + * Fri Jan 29 2021 Jan Grulich - 5.15.2-8 - Disable statx and renameat2 on RHEL