From c65c611e3311d8458e013188ebfe89581d771f13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 17:11:17 +0000 Subject: [PATCH 1/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 633c98f..ad0b6b8 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.60.%{?prerel}%{?dist} +Release: 0.61.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -245,6 +245,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 5.212.0-0.61.alpha4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 5.212.0-0.60.alpha4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 94aa2286cfbecea04a40a7969fc6bd5059915730 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 9 Feb 2022 11:30:23 +0100 Subject: [PATCH 2/4] disable _package_note_flags because it breaks qt5-qtwebkit --- qt5-qtwebkit.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index ad0b6b8..ba07f02 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -1,4 +1,6 @@ -%undefine _annotated_build +# The additional linker flags break binary qt5-qtwebkits packages. +# https://bugzilla.redhat.com/show_bug.cgi?id=2046931 +%undefine _package_note_flags %global qt_module qtwebkit @@ -16,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.61.%{?prerel}%{?dist} +Release: 0.62.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -130,6 +132,7 @@ test -f Source/WebCore/Resources/textAreaResizeCorner.png # we update this change. Until such time... # Disable LTO %define _lto_cflags %{nil} +%define _package_note_flags %{nil} # The following changes of optflags ietc. are adapted from webkitgtk4 package, which # is mostly similar to this one... @@ -245,6 +248,10 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Wed Feb 09 2022 Than Ngo - 5.212.0-0.62.alpha4 +- disable _package_note_flags because it breaks qt5-qtwebkit + + * Fri Jan 21 2022 Fedora Release Engineering - 5.212.0-0.61.alpha4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 6530dc4b54ba3173b502431b79cbec4dc26208fc Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 8 Mar 2022 15:12:25 +0100 Subject: [PATCH 3/4] Rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index ba07f02..f9e02d4 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.62.%{?prerel}%{?dist} +Release: 0.63.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -248,6 +248,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Mar 08 2022 Jan Grulich - 5.212.0-0.63.alpha4 +- Rebuild (qt5) + * Wed Feb 09 2022 Than Ngo - 5.212.0-0.62.alpha4 - disable _package_note_flags because it breaks qt5-qtwebkit From 84461703db68e6a734668cab806a32dac2b98e72 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 29 Apr 2022 22:57:49 -0700 Subject: [PATCH 4/4] Disable debug packages. It breaks x86_64 on epel9-next. --- qt5-qtwebkit.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index f9e02d4..2e0ec93 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -2,6 +2,11 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=2046931 %undefine _package_note_flags +# Fix some epel9-next wierdness +%global _debugsource_template %{nil} +%global debug_package %{nil} +%global debug_config %{nil} + %global qt_module qtwebkit %global _hardened_build 1 @@ -18,7 +23,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.63.%{?prerel}%{?dist} +Release: 0.63.%{?prerel}%{?dist}.1 Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -248,6 +253,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Apr 29 2022 Troy Dawson - 5.212.0-0.63.alpha4.1 +- Disable debug packages. It breaks x86_64 on epel9-next. + * Tue Mar 08 2022 Jan Grulich - 5.212.0-0.63.alpha4 - Rebuild (qt5)