.gitignore

@@ -1 +1 @@
-SOURCES/qttools-everywhere-opensource-src-5.15.3.tar.xz
+SOURCES/qttools-everywhere-opensource-src-5.15.9.tar.xz

.qt5-qttools.metadata

@@ -0,0 +1 @@
+f2252757e6eadbdb34995bbef404db12ff76c62c SOURCES/qttools-everywhere-opensource-src-5.15.9.tar.xz

SPECS/qt5-qttools.spec

@@ -2,10 +2,17 @@
 
 %global build_tests 1
 
+#global bootstrap 1
+
+%if ! 0%{?bootstrap}
+## don't enable until crasher fixed: https://bugzilla.redhat.com/show_bug.cgi?id=1470778
+#global webkit 1
+%endif
+
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
-Version: 5.15.3
+Version: 5.15.9
-Release: 6%{?dist}
+Release: 4%{?dist}
 
 License: LGPLv3 or LGPLv2
 Url:     http://www.qt.io
@@ -23,16 +30,18 @@ Patch4: qttools-opensource-src-5.7-add-libatomic.patch
 # https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package
 Patch5: 0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
 
-## upstream patches
 %if 0%{?build_tests}
 Patch100: qttools-fix-data-files-path-for-tests.patch
 %endif
 
+## upstream patches
+
 Source20: assistant.desktop
 Source21: designer.desktop
 Source22: linguist.desktop
 Source23: qdbusviewer.desktop
 
+BuildRequires: make
 # %%check needs cmake (and don't want to mess with cmake28)
 %if 0%{?fedora} || 0%{?rhel} > 6
 BuildRequires: cmake
@@ -40,20 +49,24 @@ BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: /usr/bin/file
 BuildRequires: qt5-rpm-macros >= %{version}
+
 BuildRequires: qt5-qtbase-private-devel
 BuildRequires: qt5-qtbase-static >= %{version}
 BuildRequires: qt5-qtdeclarative-static >= %{version}
 BuildRequires: pkgconfig(Qt5Qml)
 # libQt5DBus.so.5(Qt_5_PRIVATE_API)
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+
+%if 0%{?bootstrap}
+%global no_examples CONFIG-=compile_examples
+Obsoletes: %{name}-examples < %{version}-%{release}
+%else
 # for qdoc
 BuildRequires: clang-devel llvm-devel
+%endif
 
 Requires: %{name}-common = %{version}-%{release}
 
-# when -libs were split out, for multilib upgrade path
-Obsoletes: qt5-tools < 5.4.0-0.2
-
 %description
 %{summary}.
 
@@ -89,8 +102,6 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 %package libs-designer
 Summary: Qt5 Designer runtime library
 Requires: %{name}-common = %{version}-%{release}
-# when split happened
-Conflicts: qt5-tools < 5.4.0-0.2
 %description libs-designer
 %{summary}.
 
@@ -100,8 +111,6 @@ Requires: %{name}-common = %{version}-%{release}
 Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
-# when split happened
-Conflicts: qt5-tools < 5.4.0-0.2
 %description libs-designercomponents
 %{summary}.
 
@@ -194,21 +203,22 @@ Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
 %endif
 
 %build
-export LLVM_INSTALL_DIR=/usr
+%{qmake_qt5} \
-
+  %{?no_examples}
-%{qmake_qt5}
 
 %make_build
 
 %if 0%{?build_tests}
-make sub-tests %{?_smp_mflags} -k ||:
+%qt5_build_tests
 %endif
 
 %install
 make install INSTALL_ROOT=%{buildroot}
 
 %if 0%{?build_tests}
-# Install tests for gating
+# FIXME: qttools is special case and we cannot use qt5_install_tests macro as
+# it skips many data files used by qttools unit tests
+#qt5_install_tests
 mkdir -p %{buildroot}%{_qt5_libdir}/qt5
 find ./tests -not -path '*/\.*' -type d | while read LINE
 do
@@ -243,7 +253,7 @@ mkdir %{buildroot}%{_bindir}
 pushd %{buildroot}%{_qt5_bindir}
 for i in * ; do
   case "${i}" in
-    assistant|designer|lconvert|linguist|lrelease|lupdate|lprodump|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner)
+   assistant|designer|lconvert|linguist|lrelease|lupdate|lprodump|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner)
       ln -v  ${i} %{buildroot}%{_bindir}/${i}-qt5
       ln -sv ${i} ${i}-qt5
       ;;
@@ -311,16 +321,18 @@ popd
 %license LICENSE.LGPL*
 
 %ldconfig_scriptlets libs-designer
+
 %files  libs-designer
 %{_qt5_libdir}/libQt5Designer.so.5*
 %dir %{_qt5_libdir}/cmake/Qt5Designer/
 
 %ldconfig_scriptlets libs-designercomponents
+
 %files  libs-designercomponents
 %{_qt5_libdir}/libQt5DesignerComponents.so.5*
-%{_qt5_libdir}/cmake/Qt5DesignerComponents/Qt5DesignerComponentsConfig*.cmake
 
 %ldconfig_scriptlets libs-help
+
 %files  libs-help
 %{_qt5_libdir}/libQt5Help.so.5*
 
@@ -388,6 +400,7 @@ fi
 %{_qt5_bindir}/designer*
 %{_datadir}/applications/*designer.desktop
 %{_datadir}/icons/hicolor/*/apps/designer*.*
+%{_qt5_libdir}/cmake/Qt5DesignerComponents/Qt5DesignerComponentsConfig*.cmake
 
 %if 0%{?webkit}
 %files -n qt5-designer-plugin-webkit
@@ -451,7 +464,6 @@ fi
 %{_datadir}/applications/*qdbusviewer.desktop
 %{_datadir}/icons/hicolor/*/apps/qdbusviewer*.*
 
-
 %files devel
 %{_bindir}/pixeltool*
 %{_bindir}/qcollectiongenerator*
@@ -499,11 +511,13 @@ fi
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools.pri
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri
 
+%if ! 0%{?no_examples:1}
 %files examples
 %{_qt5_examplesdir}/
 %{_qt5_plugindir}/designer/*
 %dir %{_qt5_libdir}/cmake/Qt5Designer
 %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_*
+%endif
 
 %if 0%{?build_tests}
 %files tests
@@ -511,90 +525,153 @@ fi
 %endif
 
 %changelog
-* Tue Nov 07 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.3-6
+* Mon Oct 09 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-4
 - Rebuild (LLVM-17)
-  Resolves: RHEL-10694
+  Resolves: RHEL-10594
 
-* Fri Jun 16 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.3-5
+* Mon May 08 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-3
 - Rebuild (LLVM-16)
-  Resolves: bz#2192951
+  Resolves: bz#2192954
 
-* Wed Mar 01 2023 bstinson@redhat.com - 5.15.3-4.0.1
+* Tue Apr 25 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-2
-- Rebuild only in CentOS Stream for the right llvm links
+- Rebuild (elfutils#2188064)
+  Resolves: bz#2175743
 
-* Tue Nov 22 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-4
+* Mon Apr 17 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-1
-- Add versioned dependencies between subpackages
+- 5.15.9
-  Resolves: bz#2144798
+  Resolves: bz#2175743
 
-* Mon Oct 24 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-3
+* Mon Oct 24 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-4
 - Rebuild (LLVM-15)
-  Resolves: bz#2119038
+  Resolves: bz#2119003
 
-* Mon Jun 20 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-2
+- Add versioned dependencies between subpackages
+  Resolves: bz#2088352
+
+* Thu May 19 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-3
 - Rebuild (LLVM-14)
-  Resolves: bz#2064527
+  Resolves: bz#2061054
+
+* Wed Apr 20 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-2
+- Fix unit tests used by gating
+  Resolves: bz#2061370
 
 * Mon Mar 28 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
 - 5.15.3
-  Resolves: bz#2061406
+  Resolves: bz#2061370
 
-* Tue Jan 11 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.2-4
+* Fri Dec 17 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-11
-- Rebuild (LLVM-13)
+- Rebuild (LLVM13)
-  Resolves: bz#2001153
+  Resolves: bz#2001129
 
-* Fri Jun 25 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-3
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.2-10
-- Rebuild (LLVM-12)
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Resolves: bz#1930043
+  Related: rhbz#1991688
 
-* Wed Apr 28 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-2
+* Wed Jun 09 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-9
-- Rebuild (binutils)
+- Add gating tests
-  Resolves: bz#1930043
+  Resolves: bz#1968475
 
-* Wed Mar 31 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
+* Thu May 13 2021 Tom Stellard <tstellar@redhat.com> - 5.15.2-8
+- Rebuild for LLVM12
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.2-7
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Mon Feb 08 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-6
+- Rebuild (clang)
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 22 2021 Tom Stellard <tstellar@redhat.com> - 5.15.2-4
+- Rebuild for clang-11.1.0
+
+* Thu Dec 10 14:18:27 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-3
+- Bump for eln build
+
+* Tue Nov 24 07:54:16 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-2
+- Rebuild for qtbase with -no-reduce-relocations option
+
+* Fri Nov 20 09:30:47 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
 - 5.15.2
-  Resolves: bz#1930043
 
-* Tue May 12 2020 Jan Grulich <jgrulich@redhat.com> - 5.12.5-2
+* Tue Oct 27 2020 Leigh Scott <leigh123linux@gmail.com> - 5.15.1-3
-- Rebuild (LLVM-10)
+- Bump to fix hash issue on rpmfusion koji
-  Resolves: bz#1832857
 
-* Thu Nov 07 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
+* Mon Oct 19 2020 Kalev Lember <klember@redhat.com> - 5.15.1-2
+- Disable lto to work around lconvert segfaulting on armv7hl (#1884681)
+
+* Thu Sep 10 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1
+- 5.15.1
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Apr 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-1
+- 5.14.2
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 06 2020 Tom Stellard <tstellar@redhat.com> - 5.13.2-4
+- Link against libclang-cpp.so
+- https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package
+
+* Wed Dec 18 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-3
+- Use -qt5 suffix for linguist tools
+
+* Wed Dec 18 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-2
+- Move lprodump to qt5-linguist
+
+* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-1
+- 5.13.2
+
+* Thu Sep 26 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-2
+- rebuild (clang)
+
+* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
 - 5.12.5
-  Resolves: bz#1733152
 
-* Fri Jun 07 2019 Jan Grulich <jgrulich@redhat.com> - 5.11.1-9
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-2
-- Fix unit tests for gating
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-  Resolves: bz#1681905
 
-* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.11.1-8
+* Fri Jun 14 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-1
-- Fix unit tests for gating
+- 5.12.4
-  Resolves: bz#1681905
 
-* Mon May 20 2019 Jan Grulich <jgrulich@redhat.com> - 5.11.1-7
+* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
-- Create a tests subpkg with unit tests for gating
+- 5.12.3
-  Resolves: bz#1681905
 
-* Fri May 17 2019 Jan Grulich <jgrulich@redhat.com> - 5.11.1-6
+* Fri Feb 15 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-1
-- Rebuild for LLVM 8.0.0
+- 5.12.1
-  Resolves: bz#1709949
+- better bootstrap support (examples)
 
-* Wed Dec 12 2018 Tom Stellard <tstellar@redhat.com> - 5.11.1-5
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2
-- Rebuld for LLVM 7.0.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-  Resolves: bz#1657229
 
-* Mon Dec 10 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-4
+* Fri Dec 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-1
-- Rebuild to fix CET notes
+- 5.11.3
-  Resolves: bz#1657229
 
-* Tue Aug 07 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-3
+* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.2-1
-- Downgrade llvm_toolset version
+- 5.11.2
 
-* Tue Jul 10 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-2
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-2
-- enable qdoc
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Fri Jun 29 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-1
+* Wed Jun 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
 - 5.11.1
 
+* Sat May 26 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1
+- 5.11.0
+- use %%make_build
+
+* Thu Mar 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-2
+- BR: qt5-rpm-macros
+
 * Tue Feb 13 2018 Jan Grulich <jgrulich@redhat.com> - 5.10.1-1
 - 5.10.1