From 5b0e158eb33cd92b0e1a239133d090714d0b0f94 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 5 Dec 2015 19:09:20 -0600 Subject: [PATCH 01/28] Start to implement 5.6.0 beta, bootstrapped --- .gitignore | 1 + qt5-qttools.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ad0b49e..e932358 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /qttools-opensource-src-5.5.0.tar.xz /qttools-opensource-src-5.5.1-rc1.tar.xz /qttools-opensource-src-5.5.1.tar.xz +/qttools-opensource-src-5.6.0-beta1.tar.xz diff --git a/qt5-qttools.spec b/qt5-qttools.spec index ba84d16..6e76499 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -1,5 +1,5 @@ -#global bootstrap 1 +%global bootstrap 1 %global qt_module qttools %if 0%{?fedora} > 19 || 0%{?rhel} > 6 @@ -15,12 +15,12 @@ %endif %endif -## define prerelease rc1 +%define prerelease beta1 Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.5.1 -Release: 2%{?dist} +Version: 5.6.0 +Release: 0.1%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -47,7 +47,10 @@ BuildRequires: desktop-file-utils BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-static >= %{version} BuildRequires: qt5-qtdeclarative-static >= %{version} +## optional (and deprecated), include in bootstrapping only for now +%if ! 0%{?bootstrap} BuildRequires: qt5-qtwebkit-devel +%endif %if 0%{?system_clucene} BuildRequires: clucene09-core-devel >= 0.9.21b-12 @@ -466,6 +469,9 @@ fi %changelog +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta, bootstrapped + * Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 - Update to final release 5.5.1 diff --git a/sources b/sources index 830fa37..99b91bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -535ff9df9d83e9bde08ee3913b751d07 qttools-opensource-src-5.5.1.tar.xz +76f4adf4ce2706bbb3e9cff029af55e5 qttools-opensource-src-5.6.0-beta1.tar.xz From 377ce430c15a9eb8ca2a01a84ad53f96cc002050 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 5 Dec 2015 21:44:51 -0600 Subject: [PATCH 02/28] sync changes from copr build --- qt5-qttools.spec | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 6e76499..82fbaec 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -49,7 +49,8 @@ BuildRequires: qt5-qtbase-static >= %{version} BuildRequires: qt5-qtdeclarative-static >= %{version} ## optional (and deprecated), include in bootstrapping only for now %if ! 0%{?bootstrap} -BuildRequires: qt5-qtwebkit-devel +BuildRequires: pkgconfig(Qt5WebKit) +%global webkit 1 %endif %if 0%{?system_clucene} @@ -80,6 +81,7 @@ Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release} Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release} Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel%{?_isa} +Requires: qt5-qdoc = %{version}-%{release} Requires: qt5-qhelpgenerator = %{version}-%{release} Requires: qt5-designer = %{version}-%{release} Requires: qt5-linguist = %{version}-%{release} @@ -157,6 +159,12 @@ Requires: %{name}-common = %{version}-%{release} QDbusviewer can be used to inspect D-Bus objects of running programs and invoke methods on those objects. +%package -n qt5-qdoc +Summary: Qt5 documentation generator +Requires: %{name}%{?_isa} = %{version}-%{release} +%description -n qt5-qdoc +%{summary}. + %package -n qt5-qhelpgenerator Summary: Qt5 Help generator tool Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} @@ -166,6 +174,7 @@ Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %if 0%{?docs} %package doc Summary: API documentation for %{name} +BuildRequires: qt5-qdoc BuildRequires: qt5-qhelpgenerator BuildArch: noarch %description doc @@ -338,21 +347,15 @@ fi %{_datadir}/applications/*designer.desktop %{_datadir}/icons/hicolor/*/apps/designer*.* # example designer plugins -%{_qt5_plugindir}/designer/libcontainerextension.so -%{_qt5_plugindir}/designer/libcustomwidgetplugin.so -%{_qt5_plugindir}/designer/libtaskmenuextension.so -%{_qt5_plugindir}/designer/libworldtimeclockplugin.so %{_qt5_plugindir}/designer/libqquickwidget.so %dir %{_qt5_libdir}/cmake/Qt5Designer/ -%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake -%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake +%if 0%{?webkit} %files -n qt5-designer-plugin-webkit %{_qt5_plugindir}/designer/libqwebview.so %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake +%endif %post -n qt5-linguist touch --no-create %{_datadir}/icons/hicolor ||: @@ -404,6 +407,10 @@ fi %{_datadir}/applications/*qdbusviewer.desktop %{_datadir}/icons/hicolor/*/apps/qdbusviewer*.* +%files -n qt5-qdoc +%{_bindir}/qdoc* +%{_qt5_bindir}/qdoc* + %files -n qt5-qhelpgenerator %{_bindir}/qhelpgenerator* %{_qt5_bindir}/qhelpgenerator* @@ -462,7 +469,7 @@ fi %{_qt5_docdir}/qtuitools/ %endif -%if 0%{?_qt5_examplesdir:1} +%if 0 %files examples %{_qt5_examplesdir}/ %endif From 41b468d1c3f9371cb321a5ebfe0d10ff6831a914 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 6 Dec 2015 01:45:38 -0600 Subject: [PATCH 03/28] update %files harder --- qt5-qttools.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 82fbaec..8035566 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -347,9 +347,17 @@ fi %{_datadir}/applications/*designer.desktop %{_datadir}/icons/hicolor/*/apps/designer*.* # example designer plugins +%{_qt5_plugindir}/designer/libcontainerextension.so +%{_qt5_plugindir}/designer/libcustomwidgetplugin.so %{_qt5_plugindir}/designer/libqquickwidget.so +%{_qt5_plugindir}/designer/libtaskmenuextension.so +%{_qt5_plugindir}/designer/libworldtimeclockplugin.so %dir %{_qt5_libdir}/cmake/Qt5Designer/ +%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake +%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake +%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake +%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake %if 0%{?webkit} %files -n qt5-designer-plugin-webkit @@ -441,9 +449,9 @@ fi %dir %{_qt5_libdir}/cmake/Qt5Help/ %{_qt5_libdir}/cmake/Qt5Help/Qt5HelpConfig*.cmake %{_qt5_libdir}/cmake/Qt5UiPlugin/ -%{_qt5_libdir}/pkgconfig/Qt5CLucene.pc +#{_qt5_libdir}/pkgconfig/Qt5CLucene.pc %{_qt5_libdir}/pkgconfig/Qt5Designer.pc -%{_qt5_libdir}/pkgconfig/Qt5DesignerComponents.pc +#{_qt5_libdir}/pkgconfig/Qt5DesignerComponents.pc %{_qt5_libdir}/pkgconfig/Qt5Help.pc %{_qt5_archdatadir}/mkspecs/modules/*.pri @@ -469,10 +477,8 @@ fi %{_qt5_docdir}/qtuitools/ %endif -%if 0 %files examples %{_qt5_examplesdir}/ -%endif %changelog From 898bc97185062c068aad85561f1b8b4c7a5e7385 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 6 Dec 2015 06:54:10 -0600 Subject: [PATCH 04/28] omit some designer plugin examples minor frustration, a scratch build including these seems to succeed, but a real build doesn't and fails. So, here's a try omitting them. The cynic in me expects the designer plugin examples to actually build and install now. :-/ ha ha ha --- qt5-qttools.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 8035566..bf9228c 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -347,17 +347,17 @@ fi %{_datadir}/applications/*designer.desktop %{_datadir}/icons/hicolor/*/apps/designer*.* # example designer plugins -%{_qt5_plugindir}/designer/libcontainerextension.so -%{_qt5_plugindir}/designer/libcustomwidgetplugin.so +#{_qt5_plugindir}/designer/libcontainerextension.so +#{_qt5_plugindir}/designer/libcustomwidgetplugin.so %{_qt5_plugindir}/designer/libqquickwidget.so -%{_qt5_plugindir}/designer/libtaskmenuextension.so -%{_qt5_plugindir}/designer/libworldtimeclockplugin.so +#{_qt5_plugindir}/designer/libtaskmenuextension.so +#{_qt5_plugindir}/designer/libworldtimeclockplugin.so %dir %{_qt5_libdir}/cmake/Qt5Designer/ -%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake +#{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake +#{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake -%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake +#{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake +#{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake %if 0%{?webkit} %files -n qt5-designer-plugin-webkit From 288c88048eb1399f73f1a16082e6bca6b31c702c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 6 Dec 2015 07:10:27 -0600 Subject: [PATCH 05/28] and non examples build (this time) --- qt5-qttools.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index bf9228c..9b7ba07 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -477,8 +477,10 @@ fi %{_qt5_docdir}/qtuitools/ %endif +%if 0 %files examples %{_qt5_examplesdir}/ +%endif %changelog From 2ea74728eb94317bad2d33d15300df9e64df9908 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Dec 2015 05:17:28 -0600 Subject: [PATCH 06/28] de-bootstrap --- qt5-qttools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 9b7ba07..6e0e04e 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -1,5 +1,5 @@ -%global bootstrap 1 +#global bootstrap 1 %global qt_module qttools %if 0%{?fedora} > 19 || 0%{?rhel} > 6 @@ -20,7 +20,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 0.1%{?dist} +Release: 0.2%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -484,6 +484,9 @@ fi %changelog +* Sun Dec 06 2015 Rex Dieter 5.6.0-0.2 +- de-bootstrap + * Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 - Start to implement 5.6.0 beta, bootstrapped From 919affbf4175c7137526ecceb914410c82a18829 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Dec 2015 05:39:59 -0600 Subject: [PATCH 07/28] update %%files (qdoc docs) --- qt5-qttools.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 6e0e04e..7448db2 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -469,6 +469,8 @@ fi %{_qt5_docdir}/qtassistant/ %{_qt5_docdir}/qtdesigner.qch %{_qt5_docdir}/qtdesigner/ +%{_qt5_docdir}/qtdoc.qch +%{_qt5_docdir}/qtdoc/ %{_qt5_docdir}/qthelp.qch %{_qt5_docdir}/qthelp/ %{_qt5_docdir}/qtlinguist.qch From 4fd61721749691b25f1dae91de8042304d7d4f6b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Dec 2015 07:15:05 -0600 Subject: [PATCH 08/28] fix typo, workaround missing examples --- qt5-qttools.spec | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 7448db2..b570c59 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -204,6 +204,8 @@ mkdir %{_target_platform} pushd %{_target_platform} %{qmake_qt5} .. +# examples seem to get skipped (sometimes?), try this as a possible workaround for race-condition -- rex +make qmake_all make %{?_smp_mflags} %if 0%{?docs} @@ -346,18 +348,18 @@ fi %{_qt5_bindir}/designer* %{_datadir}/applications/*designer.desktop %{_datadir}/icons/hicolor/*/apps/designer*.* -# example designer plugins -#{_qt5_plugindir}/designer/libcontainerextension.so -#{_qt5_plugindir}/designer/libcustomwidgetplugin.so -%{_qt5_plugindir}/designer/libqquickwidget.so -#{_qt5_plugindir}/designer/libtaskmenuextension.so -#{_qt5_plugindir}/designer/libworldtimeclockplugin.so %dir %{_qt5_libdir}/cmake/Qt5Designer/ -#{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake -#{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake +%{_qt5_plugindir}/designer/libqquickwidget.so %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake -#{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake -#{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake +# example designer plugins +%{_qt5_plugindir}/designer/libcontainerextension.so +%{_qt5_plugindir}/designer/libcustomwidgetplugin.so +%{_qt5_plugindir}/designer/libtaskmenuextension.so +%{_qt5_plugindir}/designer/libworldtimeclockplugin.so +%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake +%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake +%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake +%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake %if 0%{?webkit} %files -n qt5-designer-plugin-webkit @@ -469,8 +471,8 @@ fi %{_qt5_docdir}/qtassistant/ %{_qt5_docdir}/qtdesigner.qch %{_qt5_docdir}/qtdesigner/ -%{_qt5_docdir}/qtdoc.qch -%{_qt5_docdir}/qtdoc/ +%{_qt5_docdir}/qdoc.qch +%{_qt5_docdir}/qdoc/ %{_qt5_docdir}/qthelp.qch %{_qt5_docdir}/qthelp/ %{_qt5_docdir}/qtlinguist.qch @@ -479,10 +481,8 @@ fi %{_qt5_docdir}/qtuitools/ %endif -%if 0 %files examples %{_qt5_examplesdir}/ -%endif %changelog From 290072fd48501cdd440bf3bf17c8deefcf429ccf Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Dec 2015 10:10:42 -0600 Subject: [PATCH 09/28] trying avoiding _smp_mflags completely --- qt5-qttools.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index b570c59..7cd1a44 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -205,8 +205,8 @@ pushd %{_target_platform} %{qmake_qt5} .. # examples seem to get skipped (sometimes?), try this as a possible workaround for race-condition -- rex -make qmake_all -make %{?_smp_mflags} +make +#make %{?_smp_mflags} %if 0%{?docs} make %{?_smp_mflags} docs From 196fdcf6ad6c464ad6856db329407fe83a8a955d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Dec 2015 13:14:58 -0600 Subject: [PATCH 10/28] macro'ize examples, and try omitting them again --- qt5-qttools.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 7cd1a44..e1a04e5 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -15,6 +15,10 @@ %endif %endif +# package examples or not, seems recent rawhide builds aren't including these +# reliably, not sure why (yet) --rex +#define examples 1 + %define prerelease beta1 Summary: Qt5 - QtTool components @@ -204,9 +208,7 @@ mkdir %{_target_platform} pushd %{_target_platform} %{qmake_qt5} .. -# examples seem to get skipped (sometimes?), try this as a possible workaround for race-condition -- rex -make -#make %{?_smp_mflags} +make %{?_smp_mflags} %if 0%{?docs} make %{?_smp_mflags} docs @@ -352,6 +354,7 @@ fi %{_qt5_plugindir}/designer/libqquickwidget.so %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake # example designer plugins +%if 0%{?examples} %{_qt5_plugindir}/designer/libcontainerextension.so %{_qt5_plugindir}/designer/libcustomwidgetplugin.so %{_qt5_plugindir}/designer/libtaskmenuextension.so @@ -360,6 +363,7 @@ fi %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake +%endif %if 0%{?webkit} %files -n qt5-designer-plugin-webkit @@ -481,8 +485,10 @@ fi %{_qt5_docdir}/qtuitools/ %endif +%if 0%{?examples} %files examples %{_qt5_examplesdir}/ +%endif %changelog From ad5d9b0037926f2f0dc9c53fee6edfb52010f1af Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Tue, 8 Dec 2015 11:58:33 +0100 Subject: [PATCH 11/28] - Update with second beta snapshot --- qt5-qttools.spec | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index e1a04e5..675a477 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -15,16 +15,12 @@ %endif %endif -# package examples or not, seems recent rawhide builds aren't including these -# reliably, not sure why (yet) --rex -#define examples 1 - -%define prerelease beta1 +%define prerelease beta2 Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 0.2%{?dist} +Release: 0.3%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -353,8 +349,6 @@ fi %dir %{_qt5_libdir}/cmake/Qt5Designer/ %{_qt5_plugindir}/designer/libqquickwidget.so %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake -# example designer plugins -%if 0%{?examples} %{_qt5_plugindir}/designer/libcontainerextension.so %{_qt5_plugindir}/designer/libcustomwidgetplugin.so %{_qt5_plugindir}/designer/libtaskmenuextension.so @@ -363,7 +357,6 @@ fi %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake -%endif %if 0%{?webkit} %files -n qt5-designer-plugin-webkit @@ -485,13 +478,15 @@ fi %{_qt5_docdir}/qtuitools/ %endif -%if 0%{?examples} %files examples %{_qt5_examplesdir}/ -%endif %changelog +* Tue Dec 08 2015 Helio Chissini de Castro - 5.6.0-3 +- Reenable examples. Some interfaces marked as examples are needed from phonon +- Update to second beta snapshot + * Sun Dec 06 2015 Rex Dieter 5.6.0-0.2 - de-bootstrap From 9688ff50ba8eac4f023f8aeabcc143b77e5c569d Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Tue, 8 Dec 2015 13:50:10 +0100 Subject: [PATCH 12/28] Missing sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e932358..d3d89a1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /qttools-opensource-src-5.5.1-rc1.tar.xz /qttools-opensource-src-5.5.1.tar.xz /qttools-opensource-src-5.6.0-beta1.tar.xz +/qttools-opensource-src-5.6.0-beta2.tar.xz diff --git a/sources b/sources index 99b91bf..d10e831 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76f4adf4ce2706bbb3e9cff029af55e5 qttools-opensource-src-5.6.0-beta1.tar.xz +d13c02093080756c734ae1b1a6f391db qttools-opensource-src-5.6.0-beta2.tar.xz From bff086e5356451ec4bb81a881734c4754549de15 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Thu, 10 Dec 2015 21:40:00 +0100 Subject: [PATCH 13/28] - Update to final official beta --- .gitignore | 1 + qt5-qttools.spec | 45 ++++++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index ad0b49e..26644cb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /qttools-opensource-src-5.5.0.tar.xz /qttools-opensource-src-5.5.1-rc1.tar.xz /qttools-opensource-src-5.5.1.tar.xz +/qttools-opensource-src-5.6.0-beta.tar.gz diff --git a/qt5-qttools.spec b/qt5-qttools.spec index ba84d16..bb4eee7 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -6,25 +6,18 @@ %global system_clucene 1 %endif -# define to build docs, need to undef this for bootstrapping -# where qt5-qttools builds are not yet available -# only primary archs (for now), allow secondary to bootstrap -%if ! 0%{?bootstrap} -%ifarch %{arm} %{ix86} x86_64 %define docs 1 -%endif -%endif -## define prerelease rc1 +%define prerelease beta Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.5.1 -Release: 2%{?dist} +Version: 5.6.0 +Release: 0.2%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io -Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz +Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.gz Patch1: qttools-opensource-src-5.3.2-system-clucene.patch @@ -47,7 +40,9 @@ BuildRequires: desktop-file-utils BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-static >= %{version} BuildRequires: qt5-qtdeclarative-static >= %{version} -BuildRequires: qt5-qtwebkit-devel +BuildRequires: pkgconfig(Qt5WebKit) +BuildRequires: qt5-qdoc +BuildRequires: qt5-qhelpgenerator %if 0%{?system_clucene} BuildRequires: clucene09-core-devel >= 0.9.21b-12 @@ -160,11 +155,19 @@ Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}} %description -n qt5-qhelpgenerator +%package -n qt5-qdoc +Summary: Qt5 documentation generator +Requires: %{name}%{?_isa} = %{version}-%{release} +%description -n qt5-qdoc +%{summary}. + %if 0%{?docs} %package doc Summary: API documentation for %{name} BuildRequires: qt5-qhelpgenerator BuildArch: noarch +Conflicts: qt5-qtbase-doc < 5.6.0 + %description doc %{summary}. %endif @@ -335,10 +338,6 @@ fi %{_datadir}/applications/*designer.desktop %{_datadir}/icons/hicolor/*/apps/designer*.* # example designer plugins -%{_qt5_plugindir}/designer/libcontainerextension.so -%{_qt5_plugindir}/designer/libcustomwidgetplugin.so -%{_qt5_plugindir}/designer/libtaskmenuextension.so -%{_qt5_plugindir}/designer/libworldtimeclockplugin.so %{_qt5_plugindir}/designer/libqquickwidget.so %dir %{_qt5_libdir}/cmake/Qt5Designer/ %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake @@ -401,6 +400,10 @@ fi %{_datadir}/applications/*qdbusviewer.desktop %{_datadir}/icons/hicolor/*/apps/qdbusviewer*.* +%files -n qt5-qdoc +%{_bindir}/qdoc* +%{_qt5_bindir}/qdoc* + %files -n qt5-qhelpgenerator %{_bindir}/qhelpgenerator* %{_qt5_bindir}/qhelpgenerator* @@ -446,7 +449,7 @@ fi %if 0%{?docs} %files doc -%doc LICENSE.FDL +%license LICENSE.FDL %{_qt5_docdir}/qtassistant.qch %{_qt5_docdir}/qtassistant/ %{_qt5_docdir}/qtdesigner.qch @@ -457,6 +460,8 @@ fi %{_qt5_docdir}/qtlinguist/ %{_qt5_docdir}/qtuitools.qch %{_qt5_docdir}/qtuitools/ +%{_qt5_docdir}/qdoc.qch +%{_qt5_docdir}/qdoc/ %endif %if 0%{?_qt5_examplesdir:1} @@ -466,6 +471,12 @@ fi %changelog +* Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.2 +- Official beta release + +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta + * Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 - Update to final release 5.5.1 diff --git a/sources b/sources index 830fa37..c0f9d39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -535ff9df9d83e9bde08ee3913b751d07 qttools-opensource-src-5.5.1.tar.xz +19de3f78d0d92a2a92c3abbc8ee27393 qttools-opensource-src-5.6.0-beta.tar.gz From 45afcb92a7b8a6f3a0434c149a8031ee781b529c Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Thu, 10 Dec 2015 22:38:24 +0100 Subject: [PATCH 14/28] - Merge fix --- qt5-qttools.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index d7cab0c..729ef88 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -154,12 +154,6 @@ Requires: %{name}-common = %{version}-%{release} QDbusviewer can be used to inspect D-Bus objects of running programs and invoke methods on those objects. -%package -n qt5-qdoc -Summary: Qt5 documentation generator -Requires: %{name}%{?_isa} = %{version}-%{release} -%description -n qt5-qdoc -%{summary}. - %package -n qt5-qhelpgenerator Summary: Qt5 Help generator tool Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} From c3266df8cb8885b06656316d0c3eb40e3e6bbdf6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 11 Dec 2015 11:02:19 -0600 Subject: [PATCH 15/28] 5.6.0-0.5 - (re)fix bootstrap macro - include qt5-qdoc/qt5-qhelpgenerator build dep deps in -doc subpkg only - fix whitespace --- qt5-qttools.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 729ef88..14fdf31 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -6,14 +6,21 @@ %global system_clucene 1 %endif +# define to build docs, need to undef this for bootstrapping +# where qt5-qttools builds are not yet available +# only primary archs (for now), allow secondary to bootstrap +%if ! 0%{?bootstrap} +%ifarch %{arm} %{ix86} x86_64 %define docs 1 +%endif +%endif %define prerelease beta Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 0.4%{?dist} +Release: 0.5%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -40,8 +47,6 @@ BuildRequires: desktop-file-utils BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-static >= %{version} BuildRequires: qt5-qtdeclarative-static >= %{version} -BuildRequires: qt5-qdoc -BuildRequires: qt5-qhelpgenerator ## optional (and deprecated), include in bootstrapping only for now %if ! 0%{?bootstrap} BuildRequires: pkgconfig(Qt5WebKit) @@ -161,7 +166,7 @@ Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %description -n qt5-qhelpgenerator %package -n qt5-qdoc -Summary: Qt5 documentation generator +Summary: Qt5 documentation generator Requires: %{name}%{?_isa} = %{version}-%{release} %description -n qt5-qdoc %{summary}. @@ -482,6 +487,11 @@ fi %changelog +* Fri Dec 11 2015 Rex Dieter - 5.6.0-0.5 +- (re)fix bootstrap macro +- include qt5-qdoc/qt5-qhelpgenerator build dep deps in -doc subpkg only +- fix whitespace + * Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.4 - Official beta release From 5198102b404a39952a3b5997f318cb612aa6edac Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 21 Dec 2015 09:13:15 +0100 Subject: [PATCH 16/28] - Update to final beta --- qt5-qttools.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 14fdf31..eca6a25 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -20,7 +20,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 0.5%{?dist} +Release: 0.6%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -487,6 +487,9 @@ fi %changelog +* Mon Dec 21 2015 Helio Chissini de Castro - 5.6.0-0.6 +- Update to final beta release + * Fri Dec 11 2015 Rex Dieter - 5.6.0-0.5 - (re)fix bootstrap macro - include qt5-qdoc/qt5-qhelpgenerator build dep deps in -doc subpkg only diff --git a/sources b/sources index c0f9d39..642867b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19de3f78d0d92a2a92c3abbc8ee27393 qttools-opensource-src-5.6.0-beta.tar.gz +30c48cefca8f592e4bd5bf6953fbd985 qttools-opensource-src-5.6.0-beta.tar.gz From 69b11946e1555f96a043f4a05a6dc3ce4f945faa Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 28 Dec 2015 23:13:33 -0600 Subject: [PATCH 17/28] update source URL, use %license --- qt5-qttools.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index eca6a25..5838c0d 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -20,11 +20,15 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 0.6%{?dist} +Release: 0.7.%{prerelease}%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io -Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.gz +%if 0%{?prerelease:1} +Source0: http://download.qt.io/development_releases/qt/5.6/%{version}-%{prerelease}/submodules/%{qt_module}-opensource-src-%{version}-%{prerelease}.tar.gz +%else +Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.gz +%endif Patch1: qttools-opensource-src-5.3.2-system-clucene.patch @@ -289,7 +293,7 @@ popd %{_qt5_bindir}/qtpaths %files common -%doc LICENSE.LGPL* +%license LICENSE.LGPL* %post libs-clucene -p /sbin/ldconfig %postun libs-clucene -p /sbin/ldconfig @@ -487,6 +491,9 @@ fi %changelog +* Mon Dec 28 2015 Rex Dieter 5.6.0-0.7.beta +- update source URL, use %%license + * Mon Dec 21 2015 Helio Chissini de Castro - 5.6.0-0.6 - Update to final beta release From 6070f357ab067fd456f6555063e1f3a8170a9741 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 17 Jan 2016 20:45:43 -0600 Subject: [PATCH 18/28] port QTBUG-43057 workaround --- qt5-qttools.spec | 10 +++++++++- qttools-opensource-src-5.6-QTBUG-43057.patch | 12 ++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 qttools-opensource-src-5.6-QTBUG-43057.patch diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 5838c0d..2af3a63 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -20,7 +20,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 0.7.%{prerelease}%{?dist} +Release: 0.8.%{prerelease}%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -36,6 +36,10 @@ Patch1: qttools-opensource-src-5.3.2-system-clucene.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1009893 Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch +# workaround https://bugreports.qt-project.org/browse/QTBUG-43057 +# 'make docs' crash on el6, use qSort instead of std::sort +Patch3: qttools-opensource-src-5.6-QTBUG-43057.patch + ## upstream patches Source20: assistant.desktop @@ -203,6 +207,7 @@ Requires: %{name}-common = %{version}-%{release} rm -rf src/assistant/3rdparty/clucene %endif %patch2 -p1 -b .qmake-qt5 +%patch3 -p1 -b .QTBUG-43057 %build @@ -491,6 +496,9 @@ fi %changelog +* Sun Jan 17 2016 Rex Dieter 5.6.0-0.8.beta +- port QTBUG-43057 workaround + * Mon Dec 28 2015 Rex Dieter 5.6.0-0.7.beta - update source URL, use %%license diff --git a/qttools-opensource-src-5.6-QTBUG-43057.patch b/qttools-opensource-src-5.6-QTBUG-43057.patch new file mode 100644 index 0000000..71ed24c --- /dev/null +++ b/qttools-opensource-src-5.6-QTBUG-43057.patch @@ -0,0 +1,12 @@ +diff -up qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp.orig qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp +--- qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp.orig 2015-12-14 10:58:18.000000000 -0600 ++++ qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp 2016-01-17 20:42:45.946004310 -0600 +@@ -1531,7 +1531,7 @@ void QDocIndexFiles::generateIndexSectio + const Aggregate* inner = static_cast(node); + + NodeList cnodes = inner->childNodes(); +- std::sort(cnodes.begin(), cnodes.end(), compareNodes); ++ qSort(cnodes.begin(), cnodes.end(), compareNodes); + + foreach (Node* child, cnodes) { + generateIndexSections(writer, child, generateInternalNodes); From 4fe73c11a59f3fff4778662ea712ec55a3861cbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 21:47:30 +0000 Subject: [PATCH 19/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- qt5-qttools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 2af3a63..1fcf485 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -20,7 +20,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 0.8.%{prerelease}%{?dist} +Release: 0.9.%{prerelease}%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -496,6 +496,9 @@ fi %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 5.6.0-0.9.beta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sun Jan 17 2016 Rex Dieter 5.6.0-0.8.beta - port QTBUG-43057 workaround From b0f07d241ca5e0e0afcb1eef3a1cb672c1b5ec26 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 15 Feb 2016 15:17:44 +0100 Subject: [PATCH 20/28] Update rc release --- .gitignore | 1 + qt5-qttools.spec | 49 +++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index be4459a..f5a94a4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /qttools-opensource-src-5.6.0-beta.tar.gz /qttools-opensource-src-5.6.0-beta1.tar.xz /qttools-opensource-src-5.6.0-beta2.tar.xz +/qttools-opensource-src-5.6.0-rc.tar.xz diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 1fcf485..2222672 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -15,19 +15,19 @@ %endif %endif -%define prerelease beta +%define prerelease rc Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 0.9.%{prerelease}%{?dist} +Release: 0.10.%{prerelease}%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io %if 0%{?prerelease:1} -Source0: http://download.qt.io/development_releases/qt/5.6/%{version}-%{prerelease}/submodules/%{qt_module}-opensource-src-%{version}-%{prerelease}.tar.gz +Source0: http://download.qt.io/development_releases/qt/5.6/%{version}-%{prerelease}/submodules/%{qt_module}-opensource-src-%{version}-%{prerelease}.tar.xz %else -Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.gz +Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz %endif Patch1: qttools-opensource-src-5.3.2-system-clucene.patch @@ -496,17 +496,20 @@ fi %changelog -* Thu Feb 04 2016 Fedora Release Engineering - 5.6.0-0.9.beta +* Mon Feb 15 2016 Helio Chissini de Castro - 5.6.0-0.10 +- Update RC release + +* Thu Feb 04 2016 Fedora Release Engineering - 5.6.0-0.9.rc - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Sun Jan 17 2016 Rex Dieter 5.6.0-0.8.beta +* Sun Jan 17 2016 Rex Dieter 5.6.0-0.8.rc - port QTBUG-43057 workaround -* Mon Dec 28 2015 Rex Dieter 5.6.0-0.7.beta +* Mon Dec 28 2015 Rex Dieter 5.6.0-0.7.rc - update source URL, use %%license * Mon Dec 21 2015 Helio Chissini de Castro - 5.6.0-0.6 -- Update to final beta release +- Update to final rc release * Fri Dec 11 2015 Rex Dieter - 5.6.0-0.5 - (re)fix bootstrap macro @@ -514,17 +517,17 @@ fi - fix whitespace * Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.4 -- Official beta release +- Official rc release * Tue Dec 08 2015 Helio Chissini de Castro - 5.6.0-3 - Reenable examples. Some interfaces marked as examples are needed from phonon -- Update to second beta snapshot +- Update to second rc snapshot * Sun Dec 06 2015 Rex Dieter 5.6.0-0.2 - de-bootstrap * Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 -- Start to implement 5.6.0 beta, bootstrapped +- Start to implement 5.6.0 rc, bootstrapped * Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 - Update to final release 5.5.1 @@ -583,30 +586,30 @@ fi * Fri Nov 28 2014 Rex Dieter 5.4.0-0.8.rc - 5.4.0-rc -* Mon Nov 03 2014 Rex Dieter 5.4.0-0.7.beta +* Mon Nov 03 2014 Rex Dieter 5.4.0-0.7.rc - out-of-tree build, use %%qmake_qt5 -* Fri Oct 31 2014 Rex Dieter 5.4.0-0.6.beta +* Fri Oct 31 2014 Rex Dieter 5.4.0-0.6.rc - respin system-clucene.patch -* Sun Oct 26 2014 Kevin Kofler 5.4.0-0.5.beta +* Sun Oct 26 2014 Kevin Kofler 5.4.0-0.5.rc - system-clucene patch: create path recursively in QtCLucene, CLucene can't -* Sun Oct 26 2014 Kevin Kofler 5.4.0-0.4.beta +* Sun Oct 26 2014 Kevin Kofler 5.4.0-0.4.rc - disable bootstrap (reenable -doc) - system-clucene patch: drop -fpermissive flag - system-clucene patch: use toLocal8Bit instead of toStdString - system_clucene: BR clucene09-core-devel >= 0.9.21b-12 (-11 was broken) -* Sat Oct 25 2014 Rex Dieter - 5.4.0-0.3.beta +* Sat Oct 25 2014 Rex Dieter - 5.4.0-0.3.rc - libQt5Designer should be in a subpackage (#1156685) - -doc: disable(boostrap for new clucene), drop dep on main pkg -* Sat Oct 25 2014 Kevin Kofler 5.4.0-0.2.beta +* Sat Oct 25 2014 Kevin Kofler 5.4.0-0.2.rc - BR and rebuild against reference-counting-enabled clucene09 (#1128293) -* Sat Oct 18 2014 Rex Dieter 5.4.0-0.1.beta -- 5.4.0-beta +* Sat Oct 18 2014 Rex Dieter 5.4.0-0.1.rc +- 5.4.0-rc * Fri Oct 17 2014 Rex Dieter 5.3.2-2 - -devel: Requires: qt5-designer-plugin-webkit @@ -644,14 +647,14 @@ fi * Mon Dec 02 2013 Rex Dieter 5.2.0-0.10.rc1 - 5.2.0-rc1 -* Mon Nov 25 2013 Rex Dieter 5.2.0-0.5.beta1 +* Mon Nov 25 2013 Rex Dieter 5.2.0-0.5.rc1 - enable -doc only on primary archs (allow secondary bootstrap) -* Sat Nov 09 2013 Rex Dieter 5.2.0-0.4.beta1 +* Sat Nov 09 2013 Rex Dieter 5.2.0-0.4.rc1 - rebuild (arm/qreal) -* Thu Oct 24 2013 Rex Dieter 5.2.0-0.3.beta1 -- 5.2.0-beta1 +* Thu Oct 24 2013 Rex Dieter 5.2.0-0.3.rc1 +- 5.2.0-rc1 * Wed Oct 16 2013 Rex Dieter 5.2.0-0.2.alpha - bootstrap ppc diff --git a/sources b/sources index 642867b..9672924 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30c48cefca8f592e4bd5bf6953fbd985 qttools-opensource-src-5.6.0-beta.tar.gz +6976f764cb1c01fd6173e190b09e63e5 qttools-opensource-src-5.6.0-rc.tar.xz From 63b6ed1b07a0977fd22a7ddf21daca4ee5a4db2c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 19 Feb 2016 09:53:56 -0600 Subject: [PATCH 21/28] workaround Qt5Designer.pc reference to non-existent Qt5UiPlugin.pc --- qt5-qttools.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 2222672..a7b70cc 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -20,7 +20,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 0.10.%{prerelease}%{?dist} +Release: 0.11.%{prerelease}%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -276,9 +276,16 @@ for prl_file in libQt5*.prl ; do done popd +## Qt5Designer.pc references non-existent Qt5UiPlugin.pc, remove the reference for now +sed -i.Qt5UiPlugin -e 's|Qt5UiPlugin||g' %{buildroot}%{_qt5_libdir}/pkgconfig/Qt5Designer.pc + + ## work-in-progress... -- rex %if 0%{?fedora} || 0%{?rhel} > 6 %check +# verify validity of Qt5Designer.pc +export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig +pkg-config --print-requires --print-requires-private Qt5Designer export CMAKE_PREFIX_PATH=%{buildroot}%{_qt5_prefix}:%{buildroot}%{_prefix} export PATH=%{buildroot}%{_qt5_bindir}:%{_qt5_bindir}:$PATH export LD_LIBRARY_PATH=%{buildroot}%{_qt5_libdir} @@ -496,6 +503,9 @@ fi %changelog +* Fri Feb 19 2016 Rex Dieter 5.6.0-0.11.rc +- workaround Qt5Designer.pc reference to non-existent Qt5UiPlugin.pc + * Mon Feb 15 2016 Helio Chissini de Castro - 5.6.0-0.10 - Update RC release From 21c8c8b9dfd377e2f332f35eb91957afdd724ca8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 19 Feb 2016 10:17:26 -0600 Subject: [PATCH 22/28] fix sed workaround, dup'd docs --- qt5-qttools.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index a7b70cc..10584a5 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -277,7 +277,7 @@ done popd ## Qt5Designer.pc references non-existent Qt5UiPlugin.pc, remove the reference for now -sed -i.Qt5UiPlugin -e 's|Qt5UiPlugin||g' %{buildroot}%{_qt5_libdir}/pkgconfig/Qt5Designer.pc +sed -i -e 's| Qt5UiPlugin||g' %{buildroot}%{_qt5_libdir}/pkgconfig/Qt5Designer.pc ## work-in-progress... -- rex @@ -494,8 +494,6 @@ fi %{_qt5_docdir}/qtlinguist/ %{_qt5_docdir}/qtuitools.qch %{_qt5_docdir}/qtuitools/ -%{_qt5_docdir}/qdoc.qch -%{_qt5_docdir}/qdoc/ %endif %files examples From 2d3d55a73bcca51c711dd6d19cccb8f8b28cb1af Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Tue, 23 Feb 2016 17:01:15 +0100 Subject: [PATCH 23/28] Update final RC --- qt5-qttools.spec | 27 ++++++++++----------------- sources | 2 +- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 2222672..d67704c 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -1,6 +1,3 @@ - -#global bootstrap 1 - %global qt_module qttools %if 0%{?fedora} > 19 || 0%{?rhel} > 6 %global system_clucene 1 @@ -9,18 +6,16 @@ # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available # only primary archs (for now), allow secondary to bootstrap -%if ! 0%{?bootstrap} %ifarch %{arm} %{ix86} x86_64 %define docs 1 %endif -%endif %define prerelease rc Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 0.10.%{prerelease}%{?dist} +Release: 0.12.%{prerelease}%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -51,15 +46,11 @@ Source23: qdbusviewer.desktop %if 0%{?fedora} || 0%{?rhel} > 6 BuildRequires: cmake %endif -BuildRequires: desktop-file-utils -BuildRequires: qt5-qtbase-devel >= %{version} +BuildRequires: pkgconfig(Qt5) >= %{version} +BuildRequires: pkgconfig(Qt5WebKit) BuildRequires: qt5-qtbase-static >= %{version} BuildRequires: qt5-qtdeclarative-static >= %{version} -## optional (and deprecated), include in bootstrapping only for now -%if ! 0%{?bootstrap} -BuildRequires: pkgconfig(Qt5WebKit) -%global webkit 1 -%endif +BuildRequires: desktop-file-utils %if 0%{?system_clucene} BuildRequires: clucene09-core-devel >= 0.9.21b-12 @@ -369,11 +360,9 @@ fi %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake -%if 0%{?webkit} %files -n qt5-designer-plugin-webkit %{_qt5_plugindir}/designer/libqwebview.so %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake -%endif %post -n qt5-linguist touch --no-create %{_datadir}/icons/hicolor ||: @@ -459,9 +448,7 @@ fi %dir %{_qt5_libdir}/cmake/Qt5Help/ %{_qt5_libdir}/cmake/Qt5Help/Qt5HelpConfig*.cmake %{_qt5_libdir}/cmake/Qt5UiPlugin/ -#{_qt5_libdir}/pkgconfig/Qt5CLucene.pc %{_qt5_libdir}/pkgconfig/Qt5Designer.pc -#{_qt5_libdir}/pkgconfig/Qt5DesignerComponents.pc %{_qt5_libdir}/pkgconfig/Qt5Help.pc %{_qt5_archdatadir}/mkspecs/modules/*.pri @@ -496,6 +483,12 @@ fi %changelog +* Tue Feb 23 2016 Helio Chissini de Castro - 5.6.0-0.12.rc +- Update to final RC + +* Fri Feb 19 2016 Helio Chissini de Castro - 5.6.0-0.11 +- QtWebKit is not optional if we do not want a broken QtCreator + * Mon Feb 15 2016 Helio Chissini de Castro - 5.6.0-0.10 - Update RC release diff --git a/sources b/sources index 9672924..893c86c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6976f764cb1c01fd6173e190b09e63e5 qttools-opensource-src-5.6.0-rc.tar.xz +348fcbaeaa4a68720f6d03d8e283a04c qttools-opensource-src-5.6.0-rc.tar.xz From 6b1792df2f858d1a100153cf92a6b47ecc45e76b Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 14 Mar 2016 22:36:38 +0100 Subject: [PATCH 24/28] - 5.6.0 release --- .gitignore | 1 + qt5-qttools.spec | 13 ++++++------- sources | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f5a94a4..43b1ad3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /qttools-opensource-src-5.6.0-beta1.tar.xz /qttools-opensource-src-5.6.0-beta2.tar.xz /qttools-opensource-src-5.6.0-rc.tar.xz +/qttools-opensource-src-5.6.0.tar.xz diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 0f432fe..1ec59c3 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -10,20 +10,16 @@ %define docs 1 %endif -%define prerelease rc +#define prerelease Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 0.12.%{prerelease}%{?dist} +Release: 1%{?prerelease:.%{prerelease}}%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io -%if 0%{?prerelease:1} -Source0: http://download.qt.io/development_releases/qt/5.6/%{version}-%{prerelease}/submodules/%{qt_module}-opensource-src-%{version}-%{prerelease}.tar.xz -%else -Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz -%endif +Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz Patch1: qttools-opensource-src-5.3.2-system-clucene.patch @@ -488,6 +484,9 @@ fi %changelog +* Mon Mar 14 2016 Helio Chissini de Castro - 5.6.0-1 +- 5.6.0 final release + * Tue Feb 23 2016 Helio Chissini de Castro - 5.6.0-0.12.rc - Update to final RC diff --git a/sources b/sources index 893c86c..36d371a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -348fcbaeaa4a68720f6d03d8e283a04c qttools-opensource-src-5.6.0-rc.tar.xz +5dd6204df7c81c684607f2fc8a5d351a qttools-opensource-src-5.6.0.tar.xz From 39ace5456954e932c25f392497ced1673977104e Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Wed, 16 Mar 2016 09:03:18 +0100 Subject: [PATCH 25/28] - 5.6.0 release --- qt5-qttools.spec | 3 +++ sources | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 1ec59c3..cc3830e 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -484,6 +484,9 @@ fi %changelog +* Wed Mar 16 2016 Helio Chissini de Castro - 5.6.0-2 +- 5.6.0 final release + * Mon Mar 14 2016 Helio Chissini de Castro - 5.6.0-1 - 5.6.0 final release diff --git a/sources b/sources index 36d371a..8c4639a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5dd6204df7c81c684607f2fc8a5d351a qttools-opensource-src-5.6.0.tar.xz +3168f5c9108d3577bc86a2ac02986c7c qttools-opensource-src-5.6.0.tar.xz From f5645d07ad032bc9e3395e2cfac3ed734365c2ed Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 17 Mar 2016 21:21:17 -0500 Subject: [PATCH 26/28] rebuild --- qt5-qttools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index cc3830e..91f0125 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -15,7 +15,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 1%{?prerelease:.%{prerelease}}%{?dist} +Release: 2%{?prerelease:.%{prerelease}}%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -484,6 +484,9 @@ fi %changelog +* Fri Mar 18 2016 Rex Dieter - 5.6.0-2 +- rebuild + * Wed Mar 16 2016 Helio Chissini de Castro - 5.6.0-2 - 5.6.0 final release From 6debab742bd031322a34f3ba56ab45b4e9b48833 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 18 Mar 2016 12:13:24 -0500 Subject: [PATCH 27/28] restore bootstrap support --- qt5-qttools.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 91f0125..beecb2f 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -6,9 +6,11 @@ # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available # only primary archs (for now), allow secondary to bootstrap +%if ! 0%{?bootstrap} %ifarch %{arm} %{ix86} x86_64 %define docs 1 %endif +%endif #define prerelease @@ -42,11 +44,15 @@ Source23: qdbusviewer.desktop %if 0%{?fedora} || 0%{?rhel} > 6 BuildRequires: cmake %endif +BuildRequires: desktop-file-utils BuildRequires: pkgconfig(Qt5) >= %{version} +## optional (and deprecated), include in bootstrapping only for now +%if ! 0%{?bootstrap} BuildRequires: pkgconfig(Qt5WebKit) +%global webkit 1 +%endif BuildRequires: qt5-qtbase-static >= %{version} BuildRequires: qt5-qtdeclarative-static >= %{version} -BuildRequires: desktop-file-utils %if 0%{?system_clucene} BuildRequires: clucene09-core-devel >= 0.9.21b-12 @@ -363,9 +369,11 @@ fi %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake +%if 0%{?webkit} %files -n qt5-designer-plugin-webkit %{_qt5_plugindir}/designer/libqwebview.so %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake +%endif %post -n qt5-linguist touch --no-create %{_datadir}/icons/hicolor ||: From bf5d90e53ec0ba207d0eb17c23037c894e0597bf Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 18 Mar 2016 12:40:23 -0500 Subject: [PATCH 28/28] bootstrap --- qt5-qttools.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index beecb2f..e9e1500 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -3,6 +3,8 @@ %global system_clucene 1 %endif +%global bootstrap 1 + # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available # only primary archs (for now), allow secondary to bootstrap @@ -17,7 +19,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 2%{?prerelease:.%{prerelease}}%{?dist} +Release: 0.2%{?prerelease:.%{prerelease}}%{?dist}.bootstrap License: LGPLv3 or LGPLv2 Url: http://www.qt.io