From ba4defdec22407f57d72bffdd3a7d106f13b2bb2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 21:51:01 +0000 Subject: [PATCH 01/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- qt5-qttools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 21f1e45..2739101 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -17,7 +17,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.4.2 -Release: 1%{?dist} +Release: 2%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -424,6 +424,9 @@ fi %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 5.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Jun 03 2015 Jan Grulich - 5.4.2-1 - 5.4.2 From aa1ad0a38847a862eb577c1ac8e3f98924a4fb68 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 29 Jun 2015 16:28:22 -0300 Subject: [PATCH 02/15] - Update rc1 5.5.0 --- qt5-qttools.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 2739101..f7df3c6 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -1,5 +1,5 @@ -#global bootstrap 1 +%global bootstrap 0 %global qt_module qttools %if 0%{?fedora} > 19 || 0%{?rhel} > 6 %global system_clucene 1 @@ -48,7 +48,7 @@ BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-static -BuildRequires: qt5-qtdeclarative-static +BuildRequires: qt5-qtdeclarative-static >= %{version} BuildRequires: qt5-qtwebkit-devel %if 0%{?system_clucene} From d257cd02fc4d63be9b7b19259277451749c11d09 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 29 Jun 2015 16:31:00 -0300 Subject: [PATCH 03/15] - Update rc1 5.5.0 --- .gitignore | 1 + qt5-qttools.spec | 41 ++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 490fc7c..349968f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qttools-opensource-src-5.4.0.tar.xz /qttools-opensource-src-5.4.1.tar.xz /qttools-opensource-src-5.4.2.tar.xz +/qttools-opensource-src-5.5.0-rc.tar.xz diff --git a/qt5-qttools.spec b/qt5-qttools.spec index f7df3c6..4f8c187 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -1,5 +1,6 @@ %global bootstrap 0 + %global qt_module qttools %if 0%{?fedora} > 19 || 0%{?rhel} > 6 %global system_clucene 1 @@ -14,19 +15,16 @@ %endif %endif +%define prerelease rc + Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.4.2 -Release: 2%{?dist} +Version: 5.5.0 +Release: 0.3.rc%{?dist} -# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details -License: LGPLv2 with exceptions or GPLv3 with exceptions -Url: http://qt-project.org/ -%if 0%{?pre:1} -Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz -%else -Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz -%endif +License: LGPLv3 or LGPLv2 +Url: http://www.qt.io +Source0: http://download.qt.io/development_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz Patch1: qttools-opensource-src-5.3.2-system-clucene.patch @@ -47,7 +45,7 @@ BuildRequires: cmake %endif BuildRequires: desktop-file-utils BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: qt5-qtbase-static +BuildRequires: qt5-qtbase-static >= %{version} BuildRequires: qt5-qtdeclarative-static >= %{version} BuildRequires: qt5-qtwebkit-devel @@ -159,7 +157,7 @@ Requires: %{name}-common = %{version}-%{release} %prep -%setup -q -n qttools-opensource-src-%{version}%{?pre:-%{pre}} +%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} %if 0%{?system_clucene} %patch1 -p1 -b .system_clucene @@ -168,7 +166,6 @@ rm -rf src/assistant/3rdparty/clucene %endif %patch2 -p1 -b .qmake-qt5 - %build mkdir %{_target_platform} pushd %{_target_platform} @@ -212,7 +209,7 @@ mkdir %{buildroot}%{_bindir} pushd %{buildroot}%{_qt5_bindir} for i in * ; do case "${i}" in - assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator) + assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo) ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5 ln -sv ${i} ${i}-qt5 ;; @@ -257,7 +254,7 @@ popd %{_qt5_bindir}/qtpaths %files common -%doc LGPL_EXCEPTION.txt LICENSE.LGPL* +%doc LICENSE.LGPL* %post libs-clucene -p /sbin/ldconfig %postun libs-clucene -p /sbin/ldconfig @@ -344,6 +341,7 @@ fi %{_bindir}/qhelpconverter* %{_bindir}/qhelpgenerator* %{_bindir}/qtdiag* +%{_bindir}/qtplugininfo* %{_qt5_bindir}/designer* %{_qt5_bindir}/lconvert* %{_qt5_bindir}/linguist* @@ -354,10 +352,12 @@ fi %{_qt5_bindir}/qcollectiongenerator* %{_qt5_bindir}/qhelpconverter* %{_qt5_bindir}/qhelpgenerator* +%{_qt5_bindir}/qtplugininfo* %{_qt5_headerdir}/QtCLucene/ %{_qt5_headerdir}/QtDesigner/ %{_qt5_headerdir}/QtDesignerComponents/ %{_qt5_headerdir}/QtHelp/ +%{_qt5_headerdir}/QtUiPlugin # phrasebooks used by linguist %{_qt5_datadir}/phrasebooks/ %{_qt5_libdir}/libQt5CLucene.prl @@ -372,6 +372,7 @@ fi %dir %{_qt5_libdir}/cmake/Qt5LinguistTools/ %{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake %{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake +%{_qt5_libdir}/cmake/Qt5UiPlugin/ %{_qt5_libdir}/pkgconfig/Qt5CLucene.pc %{_qt5_libdir}/pkgconfig/Qt5Designer.pc %{_qt5_libdir}/pkgconfig/Qt5DesignerComponents.pc @@ -424,8 +425,14 @@ fi %changelog -* Thu Jun 18 2015 Fedora Release Engineering - 5.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Sat Jun 27 2015 Helio Chissini de Castro - 5.5.0-0.3.rc +- Disable bootstrap + +* Thu Jun 25 2015 Helio Chissini de Castro - 5.5.0-0.2.rc +- Update for official RC1 released packages + +* Mon Jun 15 2015 Daniel Vrátil - 5.5.0-0.1.rc +- Qt 5.5.0 RC1 * Wed Jun 03 2015 Jan Grulich - 5.4.2-1 - 5.4.2 diff --git a/sources b/sources index 4541a0b..1672a1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2949a16131b54169119d1a14b891a10b qttools-opensource-src-5.4.2.tar.xz +60e9b99005ab6f8f67cdc059366bec59 qttools-opensource-src-5.5.0-rc.tar.xz From b009f19014f18a90ecc70a5619c49af5905146a0 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 29 Jun 2015 17:37:52 -0300 Subject: [PATCH 04/15] - Second round of builds now with bootstrap enabled due new qttools --- qt5-qttools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 4f8c187..2d6d533 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -20,7 +20,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.5.0 -Release: 0.3.rc%{?dist} +Release: 0.4.rc%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -425,6 +425,9 @@ fi %changelog +* Mon Jun 29 2015 Helio Chissini de Castro - 5.5.0-0.4.rc +- Second round of builds now with bootstrap enabled due new qttools + * Sat Jun 27 2015 Helio Chissini de Castro - 5.5.0-0.3.rc - Disable bootstrap From feb200069bb9aa8dd3c3eb24e4739e7967bc1c20 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Wed, 1 Jul 2015 11:45:30 -0300 Subject: [PATCH 05/15] - New final upstream release Qt 5.5.0 --- qt5-qttools.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 2d6d533..726087d 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -15,16 +15,16 @@ %endif %endif -%define prerelease rc +#define prerelease rc Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.5.0 -Release: 0.4.rc%{?dist} +Release: 1%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io -Source0: http://download.qt.io/development_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.xz Patch1: qttools-opensource-src-5.3.2-system-clucene.patch From 381b43aeb347aac753a13d3d2e426dfb189cd7a1 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Wed, 1 Jul 2015 13:07:09 -0300 Subject: [PATCH 06/15] - Missing proper sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 349968f..ca01823 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /qttools-opensource-src-5.4.1.tar.xz /qttools-opensource-src-5.4.2.tar.xz /qttools-opensource-src-5.5.0-rc.tar.xz +/qttools-opensource-src-5.5.0.tar.xz diff --git a/sources b/sources index 1672a1f..f5548b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -60e9b99005ab6f8f67cdc059366bec59 qttools-opensource-src-5.5.0-rc.tar.xz +2057ef2110b6a1aec260a69e2860a502 qttools-opensource-src-5.5.0.tar.xz From e644ad51ddace56b9354ae726be72c5a7a248238 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 16 Jul 2015 10:24:36 -0500 Subject: [PATCH 07/15] rebase qmake-qt5.patch --- qt5-qttools.spec | 2 +- ... qttools-opensource-src-5.5.0-qmake-qt5.patch | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) rename qttools-opensource-src-5.2.0-qmake-qt5.patch => qttools-opensource-src-5.5.0-qmake-qt5.patch (56%) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 726087d..3ca28cd 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -30,7 +30,7 @@ Patch1: qttools-opensource-src-5.3.2-system-clucene.patch # help lrelease/lupdate use/prefer qmake-qt5 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893 -Patch2: qttools-opensource-src-5.2.0-qmake-qt5.patch +Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch ## upstream patches diff --git a/qttools-opensource-src-5.2.0-qmake-qt5.patch b/qttools-opensource-src-5.5.0-qmake-qt5.patch similarity index 56% rename from qttools-opensource-src-5.2.0-qmake-qt5.patch rename to qttools-opensource-src-5.5.0-qmake-qt5.patch index 83c5604..431d7af 100644 --- a/qttools-opensource-src-5.2.0-qmake-qt5.patch +++ b/qttools-opensource-src-5.5.0-qmake-qt5.patch @@ -1,7 +1,7 @@ -diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp ---- qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-qt5 2013-11-26 19:01:52.000000000 -0600 -+++ qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp 2013-12-02 11:33:01.346611970 -0600 -@@ -318,9 +318,9 @@ int main(int argc, char **argv) +diff -up qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp +--- qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp.qmake-qt5 2015-06-29 15:13:45.000000000 -0500 ++++ qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp 2015-07-16 10:23:49.664773033 -0500 +@@ -310,9 +310,9 @@ int main(int argc, char **argv) option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); if (option.qmake_abslocation.isEmpty()) #ifdef QT_BOOTSTRAPPED @@ -13,10 +13,10 @@ diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-q #endif option.initProperties(); QMakeVfs vfs; -diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp ---- qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp.qmake-qt5 2013-11-26 19:01:52.000000000 -0600 -+++ qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp 2013-12-02 11:33:01.347611960 -0600 -@@ -1070,7 +1070,7 @@ int main(int argc, char **argv) +diff -up qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp +--- qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp.qmake-qt5 2015-06-29 15:13:46.000000000 -0500 ++++ qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp 2015-07-16 10:23:49.665773055 -0500 +@@ -1048,7 +1048,7 @@ int main(int argc, char **argv) ProFileGlobals option; option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); if (option.qmake_abslocation.isEmpty()) From a7632b3a17de557e78b46ff907b0aeff662e1c77 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 16 Jul 2015 11:32:16 -0500 Subject: [PATCH 08/15] qt5-designer, qt5-linguist, qt5-qhelpgenerator subpkgs --- qt5-qttools.spec | 135 +++++++++++++++++++++++++++++++---------------- 1 file changed, 90 insertions(+), 45 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 3ca28cd..a01a658 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -1,5 +1,5 @@ -%global bootstrap 0 +#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.5.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -54,7 +54,8 @@ BuildRequires: clucene09-core-devel >= 0.9.21b-12 %endif Requires: %{name}-common = %{version}-%{release} -%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} + +%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}} # when -libs were split out, for multilib upgrade path Obsoletes: qt5-tools < 5.4.0-0.2 @@ -76,8 +77,9 @@ 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} -Provides: qt5-designer = %{version}-%{release} -Provides: qt5-linguist = %{version}-%{release} +Requires: qt5-qhelpgenerator = %{version}-%{release} +Requires: qt5-designer = %{version}-%{release} +Requires: qt5-linguist = %{version}-%{release} %description devel %{summary}. @@ -125,25 +127,43 @@ Requires: %{name}-common = %{version}-%{release} %description -n qt5-assistant %{summary}. +%package -n qt5-designer +Summary: Design GUIs for Qt5 applications +Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release} +Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release} +%description -n qt5-designer +%{summary}. + %package -n qt5-designer-plugin-webkit Summary: Qt5 designer plugin for WebKit Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release} %description -n qt5-designer-plugin-webkit %{summary}. +%package -n qt5-linguist +Summary: Add translations to Qt5 applications +Requires: %{name}-common = %{version}-%{release} +%description -n qt5-linguist +%{summary}. + %package -n qt5-qdbusviewer Summary: D-Bus debugger and viewer Requires: %{name}-common = %{version}-%{release} -%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} +%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}} %description -n qt5-qdbusviewer QDbusviewer can be used to inspect D-Bus objects of running programs and invoke methods on those objects. +%package -n qt5-qhelpgenerator +Summary: Qt5 Help generator tool +Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} +%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}} +%description -n qt5-qhelpgenerator + %if 0%{?docs} %package doc Summary: API documentation for %{name} -# for qhelpgenerator -BuildRequires: qt5-qttools-devel +BuildRequires: qt5-qhelpgenerator BuildArch: noarch %description doc %{summary}. @@ -166,6 +186,7 @@ rm -rf src/assistant/3rdparty/clucene %endif %patch2 -p1 -b .qmake-qt5 + %build mkdir %{_target_platform} pushd %{_target_platform} @@ -295,10 +316,62 @@ fi %{_datadir}/applications/*assistant.desktop %{_datadir}/icons/hicolor/*/apps/assistant*.* +%post -n qt5-designer +touch --no-create %{_datadir}/icons/hicolor ||: + +%posttrans -n qt5-designer +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +update-desktop-database -q &> /dev/null ||: + +%postun -n qt5-designer +if [ $1 -eq 0 ] ; then +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +fi + +%files -n qt5-designer +%{_bindir}/designer* +%{_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/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 + %files -n qt5-designer-plugin-webkit %{_qt5_plugindir}/designer/libqwebview.so %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake +%post -n qt5-linguist +touch --no-create %{_datadir}/icons/hicolor ||: + +%posttrans -n qt5-linguist +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +update-desktop-database -q &> /dev/null ||: + +%postun -n qt5-linguist +if [ $1 -eq 0 ] ; then +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +fi + +%files -n qt5-linguist +%{_bindir}/linguist* +%{_qt5_bindir}/linguist* +# phrasebooks used by linguist +%{_qt5_datadir}/phrasebooks/ +%{_datadir}/applications/*linguist.desktop +%{_datadir}/icons/hicolor/*/apps/linguist*.* + %post -n qt5-qdbusviewer touch --no-create %{_datadir}/icons/hicolor ||: @@ -317,49 +390,32 @@ fi %{_datadir}/applications/*qdbusviewer.desktop %{_datadir}/icons/hicolor/*/apps/qdbusviewer*.* -%post devel -touch --no-create %{_datadir}/icons/hicolor ||: - -%posttrans devel -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database -q &> /dev/null ||: - -%postun devel -if [ $1 -eq 0 ] ; then -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: -fi +%files -n qt5-qthelpgenerator +%{_bindir}/qhelpgenerator* +%{_qt5_bindir}/qhelpgenerator* %files devel -%{_bindir}/designer* %{_bindir}/lconvert* -%{_bindir}/linguist* %{_bindir}/lrelease* %{_bindir}/lupdate* %{_bindir}/pixeltool* %{_bindir}/qcollectiongenerator* %{_bindir}/qhelpconverter* -%{_bindir}/qhelpgenerator* %{_bindir}/qtdiag* %{_bindir}/qtplugininfo* -%{_qt5_bindir}/designer* %{_qt5_bindir}/lconvert* -%{_qt5_bindir}/linguist* %{_qt5_bindir}/lrelease* %{_qt5_bindir}/lupdate* %{_qt5_bindir}/pixeltool* %{_qt5_bindir}/qtdiag* %{_qt5_bindir}/qcollectiongenerator* %{_qt5_bindir}/qhelpconverter* -%{_qt5_bindir}/qhelpgenerator* %{_qt5_bindir}/qtplugininfo* %{_qt5_headerdir}/QtCLucene/ %{_qt5_headerdir}/QtDesigner/ %{_qt5_headerdir}/QtDesignerComponents/ %{_qt5_headerdir}/QtHelp/ %{_qt5_headerdir}/QtUiPlugin -# phrasebooks used by linguist -%{_qt5_datadir}/phrasebooks/ %{_qt5_libdir}/libQt5CLucene.prl %{_qt5_libdir}/libQt5CLucene.so %{_qt5_libdir}/libQt5Designer*.prl @@ -378,23 +434,6 @@ fi %{_qt5_libdir}/pkgconfig/Qt5DesignerComponents.pc %{_qt5_libdir}/pkgconfig/Qt5Help.pc %{_qt5_archdatadir}/mkspecs/modules/*.pri -%{_datadir}/applications/*designer.desktop -%{_datadir}/applications/*linguist.desktop -%{_datadir}/icons/hicolor/*/apps/designer*.* -%{_datadir}/icons/hicolor/*/apps/linguist*.* - -# 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 %files static %{_qt5_headerdir}/QtUiTools/ @@ -425,6 +464,12 @@ fi %changelog +* Thu Jul 16 2015 Rex Dieter 5.5.0-2 +- qt5-designer, qt5-linguist, qt5-qhelpgenerator subpkgs + +* Wed Jul 1 2015 Helio Chissini de Castro 5.5.0-1 +- New final upstream release Qt 5.5.0 + * Mon Jun 29 2015 Helio Chissini de Castro - 5.5.0-0.4.rc - Second round of builds now with bootstrap enabled due new qttools From 71567a46b44647ae83ac7247c0bdc87ee4b8caee Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 16 Jul 2015 11:33:04 -0500 Subject: [PATCH 09/15] typo --- qt5-qttools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index a01a658..6b28e7e 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -390,7 +390,7 @@ fi %{_datadir}/applications/*qdbusviewer.desktop %{_datadir}/icons/hicolor/*/apps/qdbusviewer*.* -%files -n qt5-qthelpgenerator +%files -n qt5-qhelpgenerator %{_bindir}/qhelpgenerator* %{_qt5_bindir}/qhelpgenerator* From f1e02a8bd8b2f9c744dc0c5cef827a189a439a1b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 16 Jul 2015 11:43:11 -0500 Subject: [PATCH 10/15] bootstrap for initial qt5-qhelpgenerator pkg --- qt5-qttools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 6b28e7e..8411722 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 From 4a9b9634b7a552b307417da427281e1f27065207 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 29 Jul 2015 10:40:51 -0500 Subject: [PATCH 11/15] de-bootstrap --- qt5-qttools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 8411722..4261fdb 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.5.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -464,6 +464,9 @@ fi %changelog +* Wed Jul 29 2015 Rex Dieter 5.5.0-3 +- de-bootstrap + * Thu Jul 16 2015 Rex Dieter 5.5.0-2 - qt5-designer, qt5-linguist, qt5-qhelpgenerator subpkgs From 5a8d9e63d784c498b47050b85f9bb48d65189643 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 8 Aug 2015 15:38:26 -0500 Subject: [PATCH 12/15] qt5-linguist: move lconvert,lrelease,lupdate, cmake Qt5LinguistTools here --- qt5-qttools.spec | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 4261fdb..0008855 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -20,7 +20,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.5.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -141,10 +141,10 @@ Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release} %{summary}. %package -n qt5-linguist -Summary: Add translations to Qt5 applications +Summary: Qt5 Linguist Tools Requires: %{name}-common = %{version}-%{release} %description -n qt5-linguist -%{summary}. +Tools to add translations to Qt5 applications. %package -n qt5-qdbusviewer Summary: D-Bus debugger and viewer @@ -371,6 +371,17 @@ fi %{_qt5_datadir}/phrasebooks/ %{_datadir}/applications/*linguist.desktop %{_datadir}/icons/hicolor/*/apps/linguist*.* +# linguist friends +%{_bindir}/lconvert* +%{_bindir}/lrelease* +%{_bindir}/lupdate* +%{_qt5_bindir}/lconvert* +%{_qt5_bindir}/lrelease* +%{_qt5_bindir}/lupdate* +# cmake config +%dir %{_qt5_libdir}/cmake/Qt5LinguistTools/ +%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake +%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake %post -n qt5-qdbusviewer touch --no-create %{_datadir}/icons/hicolor ||: @@ -395,17 +406,11 @@ fi %{_qt5_bindir}/qhelpgenerator* %files devel -%{_bindir}/lconvert* -%{_bindir}/lrelease* -%{_bindir}/lupdate* %{_bindir}/pixeltool* %{_bindir}/qcollectiongenerator* %{_bindir}/qhelpconverter* %{_bindir}/qtdiag* %{_bindir}/qtplugininfo* -%{_qt5_bindir}/lconvert* -%{_qt5_bindir}/lrelease* -%{_qt5_bindir}/lupdate* %{_qt5_bindir}/pixeltool* %{_qt5_bindir}/qtdiag* %{_qt5_bindir}/qcollectiongenerator* @@ -425,9 +430,6 @@ fi %{_qt5_libdir}/cmake/Qt5Designer/Qt5DesignerConfig*.cmake %dir %{_qt5_libdir}/cmake/Qt5Help/ %{_qt5_libdir}/cmake/Qt5Help/Qt5HelpConfig*.cmake -%dir %{_qt5_libdir}/cmake/Qt5LinguistTools/ -%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake -%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake %{_qt5_libdir}/cmake/Qt5UiPlugin/ %{_qt5_libdir}/pkgconfig/Qt5CLucene.pc %{_qt5_libdir}/pkgconfig/Qt5Designer.pc @@ -464,6 +466,9 @@ fi %changelog +* Sat Aug 08 2015 Rex Dieter 5.5.0-4 +- qt5-linguist: move lconvert,lrelease,lupdate, cmake Qt5LinguistTools here + * Wed Jul 29 2015 Rex Dieter 5.5.0-3 - de-bootstrap From 3fb88ab47839c72703d78958a569552f892627ba Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 5 Oct 2015 13:57:42 -0300 Subject: [PATCH 13/15] - Prepare to 5.5.1 release with Qt 5.5.1 RC --- .gitignore | 1 + qt5-qttools.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ca01823..99a9c6d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /qttools-opensource-src-5.4.2.tar.xz /qttools-opensource-src-5.5.0-rc.tar.xz /qttools-opensource-src-5.5.0.tar.xz +/qttools-opensource-src-5.5.1-rc1.tar.xz diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 0008855..5ead3a5 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -15,12 +15,12 @@ %endif %endif -#define prerelease rc +%define prerelease rc1 Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.5.0 -Release: 4%{?dist} +Version: 5.5.1 +Release: 1%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -466,6 +466,9 @@ fi %changelog +* Tue Sep 29 2015 Helio Chissini de Castro - 5.5.1-1 +- Update to Qt 5.5.1 RC1 + * Sat Aug 08 2015 Rex Dieter 5.5.0-4 - qt5-linguist: move lconvert,lrelease,lupdate, cmake Qt5LinguistTools here diff --git a/sources b/sources index f5548b5..233fe72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2057ef2110b6a1aec260a69e2860a502 qttools-opensource-src-5.5.0.tar.xz +10841315a518de19740cd52f2ec7c109 qttools-opensource-src-5.5.1-rc1.tar.xz From 1c29b08c34be408fdc5e71976dd5ddbdf22c9945 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Thu, 15 Oct 2015 11:23:23 -0300 Subject: [PATCH 14/15] - Update to final release --- .gitignore | 1 + qt5-qttools.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 99a9c6d..ad0b49e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /qttools-opensource-src-5.5.0-rc.tar.xz /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 diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 5ead3a5..3c3e612 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -15,7 +15,7 @@ %endif %endif -%define prerelease rc1 +## define prerelease rc1 Summary: Qt5 - QtTool components Name: qt5-qttools diff --git a/sources b/sources index 233fe72..830fa37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10841315a518de19740cd52f2ec7c109 qttools-opensource-src-5.5.1-rc1.tar.xz +535ff9df9d83e9bde08ee3913b751d07 qttools-opensource-src-5.5.1.tar.xz From 21015cabcb28afcf45460f53bc3a27c03c5e51aa Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Thu, 15 Oct 2015 11:24:11 -0300 Subject: [PATCH 15/15] - Update to final release --- qt5-qttools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 3c3e612..ba84d16 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -20,7 +20,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.5.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -466,6 +466,9 @@ fi %changelog +* Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 +- Update to final release 5.5.1 + * Tue Sep 29 2015 Helio Chissini de Castro - 5.5.1-1 - Update to Qt 5.5.1 RC1