From 43276f7c630fe7ac282d10368daf5ad61e926c96 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 31 Mar 2016 10:05:52 -0500 Subject: [PATCH 1/5] 5.6.0-10 - Fix build on MIPS (#1322537) - drop BR: valgrind (not used, for awhile) --- qt5-qtbase.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index c6a0ced..4cb3f15 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -1,6 +1,6 @@ # See http://bugzilla.redhat.com/223663 -%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9 -%define multilib_basearchs x86_64 ppc64 s390x sparc64 +%define multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9 +%define multilib_basearchs x86_64 %{?mips64} ppc64 s390x sparc64 # support qtchooser (adds qtchooser .conf file) %define qtchooser 1 @@ -59,7 +59,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.6.0 -Release: 9%{?prerelease:.%{prerelease}}%{?dist} +Release: 10%{?prerelease:.%{prerelease}}%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -212,11 +212,6 @@ BuildRequires: libicu-devel %endif BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil) BuildRequires: pkgconfig(zlib) -# For the very first bootstrap of 5.6 we need valgring for now, as qt5-qdoc brand new -# splitted package script still using it -%ifnarch s390 -BuildRequires: valgrind -%endif %if 0%{?qtchooser} %if 0%{?fedora} @@ -963,6 +958,10 @@ fi %changelog +* Thu Mar 31 2016 Rex Dieter - 5.6.0-10 +- Fix build on MIPS (#1322537) +- drop BR: valgrind (not used, for awhile) + * Fri Mar 25 2016 Rex Dieter 5.6.0-9 - pull upstream patches (upstreamed versions, gcc6-related bits mostly) From 30057937a149c9a283aef347f8122277310afd9a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 15 Apr 2016 20:15:12 +0200 Subject: [PATCH 2/5] rebuild for ICU 57.1 --- qt5-qtbase.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 4cb3f15..976248a 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -59,7 +59,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.6.0 -Release: 10%{?prerelease:.%{prerelease}}%{?dist} +Release: 11%{?prerelease:.%{prerelease}}%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -958,6 +958,9 @@ fi %changelog +* Fri Apr 15 2016 David Tardon - 5.6.0-11 +- rebuild for ICU 57.1 + * Thu Mar 31 2016 Rex Dieter - 5.6.0-10 - Fix build on MIPS (#1322537) - drop BR: valgrind (not used, for awhile) From 1f0da3b1e7847f101145f4cfebdf3d7299639cae Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 16 Apr 2016 09:41:24 +0200 Subject: [PATCH 3/5] bootstrap --- qt5-qtbase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 976248a..9c1fa77 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -16,7 +16,7 @@ %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) ## set to 1 to enable bootstrap -%global bootstrap 0 +%global bootstrap 1 %if 0%{?fedora} > 21 # use external qt_settings pkg From c603654bde6548ff3b55a1c5face10f9417cbc06 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 16 Apr 2016 13:03:17 +0200 Subject: [PATCH 4/5] full build --- qt5-qtbase.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 9c1fa77..db0d206 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -16,7 +16,7 @@ %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) ## set to 1 to enable bootstrap -%global bootstrap 1 +%global bootstrap 0 %if 0%{?fedora} > 21 # use external qt_settings pkg @@ -59,7 +59,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.6.0 -Release: 11%{?prerelease:.%{prerelease}}%{?dist} +Release: 12%{?prerelease:.%{prerelease}}%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -958,6 +958,9 @@ fi %changelog +* Sat Apr 16 2016 David Tardon - 5.6.0-12 +- full build + * Fri Apr 15 2016 David Tardon - 5.6.0-11 - rebuild for ICU 57.1 From 234f1698e21de5d762d4f444a0c8c2f786250269 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 16 Apr 2016 20:33:41 -0500 Subject: [PATCH 5/5] devel: Provides: qt5-qtbase-private-devel (#1233829) --- qt5-qtbase.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index db0d206..6a4357d 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -59,7 +59,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.6.0 -Release: 12%{?prerelease:.%{prerelease}}%{?dist} +Release: 13%{?prerelease:.%{prerelease}}%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -246,6 +246,7 @@ BuildArch: noarch %package devel Summary: Development files for %{name} +Provides: %{name}-private-devel = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-gui%{?_isa} %if 0%{?egl} @@ -958,6 +959,9 @@ fi %changelog +* Sat Apr 16 2016 Rex Dieter - 5.6.0-13 +- -devel: Provides: qt5-qtbase-private-devel (#1233829) + * Sat Apr 16 2016 David Tardon - 5.6.0-12 - full build