diff --git a/qt5-qttools.spec b/qt5-qttools.spec index a190109..92d333d 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -1,11 +1,13 @@ +%global qt_module qttools + Name: qt5-qttools -Version: 5.15.2 -Release: 4 +Version: 5.15.10 +Release: 1 Summary: Qt5 QtTool module -License: LGPLv3 or LGPLv2 +License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) -Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qttools-everywhere-src-%{version}.tar.xz +Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz Source1: assistant.desktop Source2: designer.desktop Source3: linguist.desktop @@ -19,17 +21,22 @@ Patch3: 0001-modify-lupdate-qt5-run-error.patch BuildRequires: make BuildRequires: cmake desktop-file-utils /usr/bin/file qt5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-private-devel qt5-qtbase-devel >= %{version} qt5-qtbase-static >= %{version} -BuildRequires: clang-devel llvm-devel qt5-qtdeclarative-devel >= %{version} pkgconfig(Qt5Qml) +BuildRequires: clang-devel llvm-devel qt5-qtdeclarative-devel >= %{version} pkgconfig(Qt5Qml) qt5-qtdeclarative-static >= %{version} %{?_qt5:Requires: %{_qt5} = %{_qt5_version}} -Provides: %{name}-common = %{version}-%{release} %{name}-libs-designer = %{version}-%{release} -Obsoletes: %{name}-common < %{version}-%{release} %{name}-libs-designer < %{version}-%{release} -Provides: %{name}-libs-designercomponents = %{version}-%{release} %{name}-libs-help = %{version}-%{release} -Obsoletes: %{name}-libs-designercomponents < %{version}-%{release} %{name}-libs-help < %{version}-%{release} -Obsoletes: qt5-qttools-libs-clucene < 5.9.0 qt5-designer-plugin-webkit < 5.9.0 -Conflicts: qt5-tools < 5.4.0-0.2 +Requires: %{name}-common = %{version}-%{release} %description -This package contains Qt5 QtTool module core files. +%{summary}. + +%package common +Summary: Common files for %{name} +BuildArch: noarch +Obsoletes: qt5-qttools-libs-clucene < 5.9.0 +%if ! 0%{?webkit} +Obsoletes: qt5-designer-plugin-webkit < 5.9.0 +%endif +%description common +%{summary}. %package devel Summary: %{name} development files @@ -37,47 +44,94 @@ Requires: %{name} = %{version}-%{release} %{name}-libs-designer = %{version Requires: %{name}-libs-designercomponents = %{version}-%{release} %{name}-libs-help = %{version}-%{release} Requires: qt5-doctools = %{version}-%{release} qt5-designer = %{version}-%{release} Requires: qt5-linguist = %{version}-%{release} qt5-qtbase-devel -Provides: qt5-qttools-static = %{version}-%{release} qt5-qttools-examples = %{version}-%{release} -Obsoletes: qt5-qttools-static < %{version}-%{release} qt5-qttools-examples < %{version}-%{release} %description devel -The devel package contains libraries and header files for developing applications that use %{name}. +%{summary}. + +%package static +Summary: Static library files for %{name} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +%description static +%{summary}. + +%package libs-designer +Summary: Qt5 Designer runtime library +Requires: %{name}-common = %{version}-%{release} +%description libs-designer +%{summary}. + +%package libs-designercomponents +Summary: Qt5 Designer Components runtime library +Requires: %{name}-common = %{version}-%{release} +%description libs-designercomponents +%{summary}. + +%package libs-help +Summary: Qt5 Help runtime library +Requires: %{name}-common = %{version}-%{release} +# when split happened +Conflicts: qt5-tools < 5.4.0-0.2 +%description libs-help +%{summary}. %package -n qt5-assistant -Summary: Qt5 Documentation browser -Requires: %{name} = %{version}-%{release} +Summary: Documentation browser for Qt5 +Requires: %{name}-common = %{version}-%{release} %description -n qt5-assistant -This package contains Qt5 Documentation browser files. +%{summary}. %package -n qt5-designer -Summary: Qt5 Design GUI -Requires: %{name} = %{version}-%{release} +Summary: Design GUIs for Qt5 applications +Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release} +Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release} %description -n qt5-designer -This package contains Qt5 Design GUI files. +%{summary}. + +%if 0%{?webkit} +%package -n qt5-designer-plugin-webkit +Summary: Qt5 designer plugin for WebKit +BuildRequires: pkgconfig(Qt5WebKitWidgets) +Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release} +%description -n qt5-designer-plugin-webkit +%{summary}. +%endif %package -n qt5-linguist -Summary: Tools for Qt5 Linguist -Requires: %{name} = %{version}-%{release} +Summary: Qt5 Linguist Tools +Requires: %{name}-common = %{version}-%{release} %description -n qt5-linguist -This package contains tools to add translations to Qt5 applications. +Tools to add translations to Qt5 applications. %package -n qt5-qdbusviewer -Summary: Qt5 D-Bus debugger and viewer -Requires: %{name} = %{version}-%{release} -%{?_qt5:Requires: %{_qt5} >= %{_qt5_version}} +Summary: D-Bus debugger and viewer +Requires: %{name}-common = %{version}-%{release} +%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}} %description -n qt5-qdbusviewer -This package is created for debugging D-Bus objects. +QDbusviewer can be used to inspect D-Bus objects of running programs +and invoke methods on those objects. %package -n qt5-doctools -Summary: Tools for Qt5 doc -Provides: qt5-qdoc = %{version} qt5-qhelpgenerator = %{version} qt5-qtattributionsscanner = %{version} -Obsoletes: qt5-qdoc < 5.8.0 qt5-qhelpgenerator < 5.8.0 qt5-qtattributionsscanner < 5.8.0 -Requires: qt5-qtattributionsscanner = %{version} +Summary: Qt5 doc tools package +Provides: qt5-qdoc = %{version} +Obsoletes: qt5-qdoc < 5.8.0 +Provides: qt5-qhelpgenerator = %{version} +Obsoletes: qt5-qhelpgenerator < 5.8.0 +Provides: qt5-qtattributionsscanner = %{version} +Obsoletes: qt5-qtattributionsscanner < 5.8.0 +Requires: qt5-qtattributionsscanner = %{version} %description -n qt5-doctools -This package contains tools for Qt5 doc. +%{summary}. + +%package examples +Summary: Programming examples for %{name} +Requires: %{name}-common = %{version}-%{release} +%description examples +%{summary}. + %prep -%setup -q -n qttools-everywhere-src-%{version} +%setup -q -n %{qt_module}-everywhere-src-%{version} + %patch0 -p1 -b ..runqttools-with-qt5-suffix.patch %ifarch %{mips32} %patch1 -p1 -b .libatomic @@ -86,7 +140,9 @@ This package contains tools for Qt5 doc. %patch3 -p1 %build -%{qmake_qt5} +%{qmake_qt5} \ + %{?no_examples} + %make_build @@ -136,7 +192,7 @@ sed -i -e 's| Qt5UiPlugin||g' %{buildroot}%{_qt5_libdir}/pkgconfig/Qt5Designer.p %check -export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig +export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig:$PKG_CONFIG_PATH 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 @@ -168,12 +224,25 @@ cd - %{_qt5_bindir}/qdbus %{_qt5_bindir}/qdbus-qt5 %{_qt5_bindir}/qtpaths -%{_qt5_libdir}/libQt5Designer.so.5* -%dir %{_qt5_libdir}/cmake/Qt5Designer/ -%{_qt5_libdir}/libQt5DesignerComponents.so.5* -%{_qt5_libdir}/libQt5Help.so.5* + +%files common %license LICENSE.LGPL* +%ldconfig_scriptlets libs-designer + +%files libs-designer +%{_qt5_libdir}/libQt5Designer.so.5* +%dir %{_qt5_libdir}/cmake/Qt5Designer/ + +%ldconfig_scriptlets libs-designercomponents + +%files libs-designercomponents +%{_qt5_libdir}/libQt5DesignerComponents.so.5* + +%ldconfig_scriptlets libs-help + +%files libs-help +%{_qt5_libdir}/libQt5Help.so.5* %files -n qt5-assistant @@ -199,12 +268,20 @@ cd - %{_datadir}/icons/hicolor/*/apps/designer*.* %{_qt5_libdir}/cmake/Qt5DesignerComponents/Qt5DesignerComponentsConfig*.cmake +%if 0%{?webkit} +%files -n qt5-designer-plugin-webkit +%{_qt5_plugindir}/designer/libqwebview.so +%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake +%endif + %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*.* +# linguist friends %{_bindir}/lconvert* %{_bindir}/lrelease* %{_bindir}/lupdate* @@ -213,11 +290,11 @@ cd - %{_qt5_bindir}/lrelease* %{_qt5_bindir}/lupdate* %{_qt5_bindir}/lprodump* +# cmake config %dir %{_qt5_libdir}/cmake/Qt5LinguistTools/ %{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake %{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake - %files -n qt5-qdbusviewer %{_bindir}/qdbusviewer* %{_qt5_bindir}/qdbusviewer* @@ -235,31 +312,55 @@ cd - %{_qt5_bindir}/qcollectiongenerator* #{_qt5_bindir}/qhelpconverter* %{_qt5_bindir}/qtplugininfo* -%{_qt5_libdir}/pkgconfig/Qt5*.pc -%{_qt5_headerdir}/Qt*/ -%{_qt5_archdatadir}/mkspecs/modules/qt_lib_*.pri +%{_qt5_headerdir}/QtDesigner/ +%{_qt5_headerdir}/QtDesignerComponents/ +%{_qt5_headerdir}/QtHelp/ +%{_qt5_headerdir}/QtUiPlugin %{_qt5_libdir}/libQt5Designer*.prl %{_qt5_libdir}/libQt5Designer*.so %{_qt5_libdir}/libQt5Help.prl %{_qt5_libdir}/libQt5Help.so -%{_qt5_libdir}/libQt5UiTools.*a -%{_qt5_libdir}/libQt5UiTools.prl %{_qt5_libdir}/Qt5UiPlugin.la %{_qt5_libdir}/libQt5UiPlugin.prl %{_qt5_libdir}/cmake/Qt5Designer/Qt5DesignerConfig*.cmake %dir %{_qt5_libdir}/cmake/Qt5Help/ %{_qt5_libdir}/cmake/Qt5Help/Qt5HelpConfig*.cmake %{_qt5_libdir}/cmake/Qt5UiPlugin/ +%{_qt5_libdir}/pkgconfig/Qt5Designer.pc +%{_qt5_libdir}/pkgconfig/Qt5Help.pc +%{_qt5_libdir}/pkgconfig/Qt5UiPlugin.pc +%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer.pri +%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer_private.pri +%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designercomponents_private.pri +%{_qt5_archdatadir}/mkspecs/modules/qt_lib_help.pri +%{_qt5_archdatadir}/mkspecs/modules/qt_lib_help_private.pri +%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri +# putting these here for now, new stuff in 5.14, review for accuracy -- rdieter %{_qt5_libdir}/cmake/Qt5AttributionsScannerTools/ %{_qt5_libdir}/cmake/Qt5DocTools/ + +%files static +%{_qt5_headerdir}/QtUiTools/ +%{_qt5_libdir}/libQt5UiTools.*a +%{_qt5_libdir}/libQt5UiTools.prl %{_qt5_libdir}/cmake/Qt5UiTools/ -%dir %{_qt5_libdir}/cmake/Qt5Designer -%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_* +%{_qt5_libdir}/pkgconfig/Qt5UiTools.pc +%{_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 +* Tue Aug 22 2023 douyan - 5.15.10-1 +- update to upstream version 5.15.10 + * Wed Mar 30 2022 ouyangminxiang - 5.15.2-4 - Add Chinese translation diff --git a/qttools-everywhere-src-5.15.2.tar.xz b/qttools-everywhere-opensource-src-5.15.10.tar.xz similarity index 56% rename from qttools-everywhere-src-5.15.2.tar.xz rename to qttools-everywhere-opensource-src-5.15.10.tar.xz index 910a62b..268b3e4 100644 Binary files a/qttools-everywhere-src-5.15.2.tar.xz and b/qttools-everywhere-opensource-src-5.15.10.tar.xz differ