From a7632b3a17de557e78b46ff907b0aeff662e1c77 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 16 Jul 2015 11:32:16 -0500 Subject: [PATCH] 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