From c515289c1c4dd6fe0a86a76b286bc6a0e8b9fbb7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:10:36 +0000 Subject: [PATCH 1/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qttools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 9c540e0..333f345 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -10,7 +10,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.11.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -455,6 +455,9 @@ fi %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 5.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jun 20 2018 Rex Dieter - 5.11.1-1 - 5.11.1 From ff1b298c9f721675b5b68134169314fdf242fd18 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 21 Sep 2018 12:44:02 +0200 Subject: [PATCH 2/9] 5.11.2 --- .gitignore | 1 + qt5-qttools.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 023e28a..76f994c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qttools-everywhere-src-5.10.1.tar.xz /qttools-everywhere-src-5.11.0.tar.xz /qttools-everywhere-src-5.11.1.tar.xz +/qttools-everywhere-src-5.11.2.tar.xz diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 333f345..19d81b5 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -9,8 +9,8 @@ Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.11.1 -Release: 2%{?dist} +Version: 5.11.2 +Release: 1%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -455,6 +455,9 @@ fi %changelog +* Fri Sep 21 2018 Jan Grulich - 5.11.2-1 +- 5.11.2 + * Sat Jul 14 2018 Fedora Release Engineering - 5.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 5c0313e..f82978e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qttools-everywhere-src-5.11.1.tar.xz) = cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482 +SHA512 (qttools-everywhere-src-5.11.2.tar.xz) = a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5 From 15f3cc33c7d2759465c81972f76911557468dc81 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 7 Dec 2018 13:15:20 -0600 Subject: [PATCH 3/9] 5.11.3 --- .gitignore | 1 + qt5-qttools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 76f994c..aaa9962 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /qttools-everywhere-src-5.11.0.tar.xz /qttools-everywhere-src-5.11.1.tar.xz /qttools-everywhere-src-5.11.2.tar.xz +/qttools-everywhere-src-5.11.3.tar.xz diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 19d81b5..ab6daaa 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -9,7 +9,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.11.2 +Version: 5.11.3 Release: 1%{?dist} License: LGPLv3 or LGPLv2 @@ -455,6 +455,9 @@ fi %changelog +* Fri Dec 07 2018 Rex Dieter - 5.11.3-1 +- 5.11.3 + * Fri Sep 21 2018 Jan Grulich - 5.11.2-1 - 5.11.2 diff --git a/sources b/sources index f82978e..d1b81db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qttools-everywhere-src-5.11.2.tar.xz) = a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5 +SHA512 (qttools-everywhere-src-5.11.3.tar.xz) = f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf From fcfc7780bfcaf5cdc49cf52018dad92044f1dc32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 10:45:49 +0000 Subject: [PATCH 4/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qttools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index ab6daaa..7e667d6 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -10,7 +10,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.11.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -455,6 +455,9 @@ fi %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 5.11.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Dec 07 2018 Rex Dieter - 5.11.3-1 - 5.11.3 From 9390e3f9d69ecd306ca2191b835dd46f29cdb519 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 15 Feb 2019 10:20:59 -0600 Subject: [PATCH 5/9] 5.12.1 better bootstrap support (examples) --- .gitignore | 1 + qt5-qttools.spec | 33 +++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index aaa9962..dd3da66 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /qttools-everywhere-src-5.11.1.tar.xz /qttools-everywhere-src-5.11.2.tar.xz /qttools-everywhere-src-5.11.3.tar.xz +/qttools-everywhere-src-5.12.1.tar.xz diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 7e667d6..e57a7ea 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -9,8 +9,8 @@ Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.11.3 -Release: 2%{?dist} +Version: 5.12.1 +Release: 1%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -41,13 +41,17 @@ BuildRequires: qt5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtbase-static >= %{version} -# libQt5DBus.so.5(Qt_5_PRIVATE_API) -%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -%if ! 0%{?bootstrap} -# for qdoc -BuildRequires: clang-devel llvm-devel BuildRequires: qt5-qtdeclarative-static >= %{version} BuildRequires: pkgconfig(Qt5Qml) +# libQt5DBus.so.5(Qt_5_PRIVATE_API) +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} + +%if 0%{?bootstrap} +Obsoletes: %{name}-examples < %{version}-%{release} +%else +%global no_examples CONFIG-=compile_examples +# for qdoc +BuildRequires: clang-devel llvm-devel %endif Requires: %{name}-common = %{version}-%{release} @@ -169,7 +173,8 @@ Requires: %{name}-common = %{version}-%{release} %build -%{qmake_qt5} +%{qmake_qt5} \ + %{?no_examples} %make_build @@ -320,7 +325,9 @@ fi %files -n qt5-doctools %{_bindir}/qdoc* %{_qt5_bindir}/qdoc* +%{_bindir}/qdistancefieldgenerator* %{_bindir}/qhelpgenerator* +%{_qt5_bindir}/qdistancefieldgenerator* %{_qt5_bindir}/qhelpgenerator* %{_bindir}/qtattributionsscanner-qt5 %{_qt5_bindir}/qtattributionsscanner* @@ -409,13 +416,13 @@ fi %files devel %{_bindir}/pixeltool* %{_bindir}/qcollectiongenerator* -%{_bindir}/qhelpconverter* +#{_bindir}/qhelpconverter* %{_bindir}/qtdiag* %{_bindir}/qtplugininfo* %{_qt5_bindir}/pixeltool* %{_qt5_bindir}/qtdiag* %{_qt5_bindir}/qcollectiongenerator* -%{_qt5_bindir}/qhelpconverter* +#{_qt5_bindir}/qhelpconverter* %{_qt5_bindir}/qtplugininfo* %{_qt5_headerdir}/QtDesigner/ %{_qt5_headerdir}/QtDesignerComponents/ @@ -447,14 +454,20 @@ 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 %changelog +* Fri Feb 15 2019 Rex Dieter - 5.12.1-1 +- 5.12.1 +- better bootstrap support (examples) + * Sat Feb 02 2019 Fedora Release Engineering - 5.11.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index d1b81db..a2ba0b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qttools-everywhere-src-5.11.3.tar.xz) = f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf +SHA512 (qttools-everywhere-src-5.12.1.tar.xz) = e3ae1974f0b20bad1b86d038c3585753183b8c24c133393e3ecf65a0487402ad8dcf8147bf263e9a4c2d3abef1b706981943fcf5268726e424f1b61f69ce4f2e From 3cb7a7ee18173aae73fb1b87706ba26ba63936d2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 15 Feb 2019 10:35:03 -0600 Subject: [PATCH 6/9] fix bootstrap logic, bootstrap => no_examples --- qt5-qttools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index e57a7ea..9bd7316 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -47,9 +47,9 @@ BuildRequires: pkgconfig(Qt5Qml) %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} %if 0%{?bootstrap} +%global no_examples CONFIG-=compile_examples Obsoletes: %{name}-examples < %{version}-%{release} %else -%global no_examples CONFIG-=compile_examples # for qdoc BuildRequires: clang-devel llvm-devel %endif From edf3c2ca5359abd6f80cb52a4b10cf6050f36c05 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 4 Jun 2019 15:11:56 +0200 Subject: [PATCH 7/9] 5.12.3 --- .gitignore | 1 + qt5-qttools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dd3da66..7ab5cc1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /qttools-everywhere-src-5.11.2.tar.xz /qttools-everywhere-src-5.11.3.tar.xz /qttools-everywhere-src-5.12.1.tar.xz +/qttools-everywhere-src-5.12.3.tar.xz diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 9bd7316..d43b2f3 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -9,7 +9,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.12.1 +Version: 5.12.3 Release: 1%{?dist} License: LGPLv3 or LGPLv2 @@ -464,6 +464,9 @@ fi %changelog +* Tue Jun 04 2019 Jan Grulich - 5.12.3-1 +- 5.12.3 + * Fri Feb 15 2019 Rex Dieter - 5.12.1-1 - 5.12.1 - better bootstrap support (examples) diff --git a/sources b/sources index a2ba0b2..6d8b73f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qttools-everywhere-src-5.12.1.tar.xz) = e3ae1974f0b20bad1b86d038c3585753183b8c24c133393e3ecf65a0487402ad8dcf8147bf263e9a4c2d3abef1b706981943fcf5268726e424f1b61f69ce4f2e +SHA512 (qttools-everywhere-src-5.12.3.tar.xz) = d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e From 7dd68ee90a224790584c531748360ce4082f23ff Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 14 Jun 2019 08:58:11 +0200 Subject: [PATCH 8/9] 5.12.4 --- .gitignore | 1 + qt5-qttools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7ab5cc1..cabf1e7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /qttools-everywhere-src-5.11.3.tar.xz /qttools-everywhere-src-5.12.1.tar.xz /qttools-everywhere-src-5.12.3.tar.xz +/qttools-everywhere-src-5.12.4.tar.xz diff --git a/qt5-qttools.spec b/qt5-qttools.spec index d43b2f3..c9ee4a8 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -9,7 +9,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.12.3 +Version: 5.12.4 Release: 1%{?dist} License: LGPLv3 or LGPLv2 @@ -464,6 +464,9 @@ fi %changelog +* Fri Jun 14 2019 Jan Grulich - 5.12.4-1 +- 5.12.4 + * Tue Jun 04 2019 Jan Grulich - 5.12.3-1 - 5.12.3 diff --git a/sources b/sources index 6d8b73f..ac93522 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qttools-everywhere-src-5.12.3.tar.xz) = d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e +SHA512 (qttools-everywhere-src-5.12.4.tar.xz) = 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466 From c8adf64475aa6b189b65b1b90e6cb0b5438d802a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 17:51:56 +0000 Subject: [PATCH 9/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qttools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index c9ee4a8..e3ecf99 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -10,7 +10,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.12.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -464,6 +464,9 @@ fi %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 5.12.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jun 14 2019 Jan Grulich - 5.12.4-1 - 5.12.4