From 0764d324f3fdd4212c82f027351b27db195c52469c8f31dd6aa8179eecdad506 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 29 Aug 2019 13:25:14 +0000 Subject: [PATCH 1/7] Accepting request 726999 from home:StefanBruens:branches:KDE:Qt:5.13 Fix dependency for clang header files (TW has it in libclang), cleanup OBS-URL: https://build.opensuse.org/request/show/726999 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=12 --- libqt5-qttools.changes | 11 +++++++++++ libqt5-qttools.spec | 30 +++++++++++++++--------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index 5ee88bc..4c05b62 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Aug 29 10:47:17 UTC 2019 - Stefan Brüns + +- Drop some not unnecessary library runtime Requires: libQt5Designer5, + libQt5DesignerComponents5, libQt5Help5, pulled in automatically. +- Change libqt5-qttools and libqt5-qttools-doc Requires in devel + subpackage to Recommends, as the tools are not required for building. +- Make some Summaries and Descriptions more useful. +- Correct requires for matching Clang headers, the headers are part + of the libclang package for current Clang versions + ------------------------------------------------------------------- Tue Jul 2 13:47:14 UTC 2019 - Fabian Vogt diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index eec8106..bd3cd36 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -59,18 +59,17 @@ Recommends: libqt5-qtdoc-qch >= %{version} BuildRequires: perl %endif BuildRequires: xz -Requires: libQt5Designer5 = %{version} -Requires: libQt5DesignerComponents5 = %{version} -Requires: libQt5Help5 = %{version} +# help files are SQLite databases, so assistant/qhelpgenerator need the SQLite plugin Requires: libQt5Sql5-sqlite >= %{version} Requires: libqt5-qdbus = %{version} Requires: libqt5-qtpaths = %{version} %requires_ge libQt5DBus5 %description -Qt is a set of libraries for developing applications. +The QtTools modules contains some tools mostly useful for application development. -This package contains base tools, like string, xml, and network handling. +Included are QtAssistant (help browser), QtDesigner (GUI design), QDbusViewer +and several more. %prep %autosetup -p1 -n %{tar_version} @@ -78,16 +77,14 @@ This package contains base tools, like string, xml, and network handling. %package devel Summary: Development files for the Qt5 Tools library Group: Development/Libraries/X11 -Requires: %{name} = %{version} -%if %{with qdoc} -Requires: %{name}-doc = %{version} -%endif Requires: libQt5Designer5 = %{version} Requires: libQt5DesignerComponents5 = %{version} Requires: libQt5Help5 = %{version} Requires: libqt5-linguist-devel = %{version} Requires: libxslt-devel Requires: pkgconfig(Qt5Xml) >= %{so_version} +Recommends: %{name} = %{version} +Recommends: %{name}-doc = %{version} %description devel You need this package if you want to compile programs with qttools. @@ -159,12 +156,12 @@ Requires: pkgconfig(Qt5Core) >= %{version} The Qt 5 Linguist Tools - development files. %package -n libqt5-qdbus -Summary: Interface to Qt applications communicating over D-Bus +Summary: Command line client for communication over D-Bus Group: Development/Libraries/X11 Conflicts: %{name} < %{version} %description -n libqt5-qdbus -Interface to Qt applications communicating over D-Bus. +Command line client for communication over D-Bus. %package -n libqt5-qtpaths Summary: Command line client to QStandardPaths @@ -180,7 +177,11 @@ Group: Development/Libraries/C and C++ Provides: libqt5-qtbase-doc = %{version} Obsoletes: libqt5-qtbase-doc < %{version} # qdoc hardcodes clang include paths: boo#1109367, QTBUG-70687 +%if 0%{?suse_version} < 1550 %requires_eq clang%(rpm -q --qf '%''{version}' clang-devel | cut -d. -f1) +%else +%requires_eq libclang%(rpm -q --qf '%''{version}' clang-devel | cut -d. -f1) +%endif %description doc Qt 5 tool used by Qt Developers to generate documentation for software projects. @@ -212,14 +213,13 @@ mkdir .git %install %qmake5_install -find %{buildroot}/%{_libdir} -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} + -find %{buildroot}/%{_libdir} -type f -name '*pc' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} + -exec sed -i -e "s,^moc_location=.*,moc_location=%{_libqt5_bindir}/moc," -e "s,uic_location=.*,uic_location=%{_libqt5_bindir}/uic," {} + +find %{buildroot}/%{_libdir} -type f -name '*pc' -print -exec sed -i -e "s, -L%{buildroot}/?\S+,,g" -e "s,^moc_location=.*,moc_location=%{_libqt5_bindir}/moc," -e "s,uic_location=.*,uic_location=%{_libqt5_bindir}/uic," {} + %fdupes -s %{buildroot}/%{_libqt5_includedir} # kill .la files -rm -f %{buildroot}%{_libqt5_libdir}/lib*.la +find %{buildroot}/%{_libdir} -type f -name '*.la' -print -delete -# Link all the binaries with -qt5 suffix to %{_bindir} +# Link all the binaries with -qt5 suffix to %%{_bindir} mkdir -p %{buildroot}%{_bindir} pushd %{buildroot}%{_libqt5_bindir} for i in * ; do From 94473e497774cdbb211b9d2ca4a2cf762cae7cfecac757935ca41631e6470afe Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 29 Aug 2019 14:22:25 +0000 Subject: [PATCH 2/7] Fix various build failures OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=13 --- libqt5-qttools.changes | 6 ++++++ libqt5-qttools.spec | 35 ++++++++++++++--------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index 4c05b62..f225de0 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 29 14:12:56 UTC 2019 - Christophe Giboudeaux + +- Require libqt5-qttools again. This is causing multiple build issues. +- Clean the spec file. + ------------------------------------------------------------------- Thu Aug 29 10:47:17 UTC 2019 - Stefan Brüns diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index bd3cd36..645859b 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -31,7 +31,7 @@ Release: 0 Summary: Qt 5 QtTools Module License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only Group: Development/Libraries/X11 -Url: https://www.qt.io +URL: https://www.qt.io %define base_name libqt5 %define real_version 5.13.0 %define so_version 5.13.0 @@ -77,13 +77,13 @@ and several more. %package devel Summary: Development files for the Qt5 Tools library Group: Development/Libraries/X11 +Requires: %{name} = %{version} Requires: libQt5Designer5 = %{version} Requires: libQt5DesignerComponents5 = %{version} Requires: libQt5Help5 = %{version} Requires: libqt5-linguist-devel = %{version} Requires: libxslt-devel Requires: pkgconfig(Qt5Xml) >= %{so_version} -Recommends: %{name} = %{version} Recommends: %{name}-doc = %{version} %description devel @@ -92,8 +92,8 @@ You need this package if you want to compile programs with qttools. %package private-headers-devel Summary: Non-ABI stable experimental API for the Qt5 Tools library Group: Development/Libraries/C and C++ -BuildArch: noarch Requires: %{name}-devel = %{version} +BuildArch: noarch %description private-headers-devel This package provides private headers of libqt5-qttools that are normally @@ -112,8 +112,8 @@ Examples for the libqt5-qttools module. %package -n libQt5Designer5 Summary: Qt 5 Designer Library Group: Development/Libraries/X11 -%requires_ge libQt5Widgets5 -%requires_ge libQt5Xml5 +%requires_ge libQt5Widgets5 +%requires_ge libQt5Xml5 %description -n libQt5Designer5 The Qt 5 Designer library. @@ -129,9 +129,9 @@ The Qt 5 Designer Components library. %package -n libQt5Help5 Summary: Qt 5 Help Library Group: Development/Libraries/X11 -%requires_ge libQt5Widgets5 -%requires_ge libQt5Sql5 -%requires_ge libQt5Network5 +%requires_ge libQt5Network5 +%requires_ge libQt5Sql5 +%requires_ge libQt5Widgets5 %description -n libQt5Help5 The Qt 5 Help library. @@ -139,9 +139,9 @@ The Qt 5 Help library. %package -n libqt5-linguist Summary: Qt 5 Linguist Tools Group: Development/Libraries/X11 -%requires_ge libQt5Widgets5 -%requires_ge libQt5Xml5 -%requires_ge libQt5PrintSupport5 +%requires_ge libQt5PrintSupport5 +%requires_ge libQt5Widgets5 +%requires_ge libQt5Xml5 %description -n libqt5-linguist The Qt 5 Linguist Tools. @@ -187,19 +187,12 @@ Obsoletes: libqt5-qtbase-doc < %{version} Qt 5 tool used by Qt Developers to generate documentation for software projects. %post -p /sbin/ldconfig - %post -n libQt5Designer5 -p /sbin/ldconfig - %post -n libQt5DesignerComponents5 -p /sbin/ldconfig - %post -n libQt5Help5 -p /sbin/ldconfig - %postun -p /sbin/ldconfig - %postun -n libQt5Designer5 -p /sbin/ldconfig - %postun -n libQt5DesignerComponents5 -p /sbin/ldconfig - %postun -n libQt5Help5 -p /sbin/ldconfig %build @@ -213,11 +206,11 @@ mkdir .git %install %qmake5_install -find %{buildroot}/%{_libdir} -type f -name '*pc' -print -exec sed -i -e "s, -L%{buildroot}/?\S+,,g" -e "s,^moc_location=.*,moc_location=%{_libqt5_bindir}/moc," -e "s,uic_location=.*,uic_location=%{_libqt5_bindir}/uic," {} + -%fdupes -s %{buildroot}/%{_libqt5_includedir} +find %{buildroot}%{_libdir} -type f -name '*pc' -print -exec sed -i -e "s, -L%{buildroot}/?\S+,,g" -e "s,^moc_location=.*,moc_location=%{_libqt5_bindir}/moc," -e "s,uic_location=.*,uic_location=%{_libqt5_bindir}/uic," {} + +%fdupes -s %{buildroot}%{_libqt5_includedir} # kill .la files -find %{buildroot}/%{_libdir} -type f -name '*.la' -print -delete +find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print # Link all the binaries with -qt5 suffix to %%{_bindir} mkdir -p %{buildroot}%{_bindir} From 534cc9d713622db17b99090f4aa5487c6ea54958a4cf8b6f30e8950228081dfa Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 29 Aug 2019 14:50:52 +0000 Subject: [PATCH 3/7] qdoc is also required OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=14 --- libqt5-qttools.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 645859b..1346e12 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -78,13 +78,15 @@ and several more. Summary: Development files for the Qt5 Tools library Group: Development/Libraries/X11 Requires: %{name} = %{version} +%if %{with qdoc} +Requires: %{name}-doc = %{version} +%endif Requires: libQt5Designer5 = %{version} Requires: libQt5DesignerComponents5 = %{version} Requires: libQt5Help5 = %{version} Requires: libqt5-linguist-devel = %{version} Requires: libxslt-devel Requires: pkgconfig(Qt5Xml) >= %{so_version} -Recommends: %{name}-doc = %{version} %description devel You need this package if you want to compile programs with qttools. From 4b057feb14fd36288c390e2e413ba511c5c7f58db411fce1af8804cd0c33cc3c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 2 Sep 2019 11:19:05 +0000 Subject: [PATCH 4/7] Accepting request 727736 from home:StefanBruens:branches:KDE:Qt:5.13 Drop not strictly required build dependencies, again OBS-URL: https://build.opensuse.org/request/show/727736 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=15 --- libqt5-qttools.changes | 7 +++++++ libqt5-qttools.spec | 26 +++++++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index f225de0..7a4bccb 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 29 17:41:21 UTC 2019 - Stefan Brüns + +- Remove the accidental dependency from the devel package on the + Qt Designer example plugins, referenced in the cmake files. +- Move the example plugins to a separate subpackage. + ------------------------------------------------------------------- Thu Aug 29 14:12:56 UTC 2019 - Christophe Giboudeaux diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 1346e12..750a1c9 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -77,16 +77,14 @@ and several more. %package devel Summary: Development files for the Qt5 Tools library Group: Development/Libraries/X11 -Requires: %{name} = %{version} -%if %{with qdoc} -Requires: %{name}-doc = %{version} -%endif Requires: libQt5Designer5 = %{version} Requires: libQt5DesignerComponents5 = %{version} Requires: libQt5Help5 = %{version} Requires: libqt5-linguist-devel = %{version} Requires: libxslt-devel Requires: pkgconfig(Qt5Xml) >= %{so_version} +Recommends: %{name} = %{version} +Recommends: %{name}-doc = %{version} %description devel You need this package if you want to compile programs with qttools. @@ -111,6 +109,14 @@ Recommends: %{name}-devel %description examples Examples for the libqt5-qttools module. +%package example-plugins +Summary: Example plugins for Qt5 Designer +Group: Development/Libraries/X11 +Recommends: %{name}-examples + +%description example-plugins +Example plugins for Qt5 Designer, e.g. a TicTacToe and a World Clock widget. + %package -n libQt5Designer5 Summary: Qt 5 Designer Library Group: Development/Libraries/X11 @@ -231,6 +237,10 @@ for i in * ; do done popd +# Do not add dependencies on the implementation of the abstract Designer plugin +# interface provided by the plugins, QTCREATORBUG-22886 +rm %{buildroot}%{_libqt5_libdir}/cmake/Qt5Designer/Qt5Designer_*Plugin.cmake + install -D -m644 %{SOURCE11} %{buildroot}%{_datadir}/applications/designer5.desktop install -D -m644 %{SOURCE12} %{buildroot}%{_datadir}/applications/linguist5.desktop install -D -m644 %{SOURCE13} %{buildroot}%{_datadir}/applications/assistant5.desktop @@ -275,7 +285,8 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %{_datadir}/icons/hicolor/*/apps/assistant5.png %{_datadir}/icons/hicolor/*/apps/designer5.png %{_datadir}/icons/hicolor/*/apps/qdbusviewer5.png -%{_libqt5_libdir}/qt5/plugins/designer +%dir %{_libqt5_libdir}/qt5/plugins/designer +%{_libqt5_libdir}/qt5/plugins/designer/libqquickwidget.so %files -n libqt5-linguist %license LICENSE.* @@ -362,4 +373,9 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %license LICENSE.* %{_libqt5_examplesdir}/ +%files example-plugins +%license LICENSE.* +%{_libqt5_libdir}/qt5/plugins/designer +%exclude %{_libqt5_libdir}/qt5/plugins/designer/libqquickwidget.so + %changelog From d29ed8460d4ac313a407092445c268bdb4514d9c86f833763921eda7f7b16b9c Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 2 Sep 2019 11:20:28 +0000 Subject: [PATCH 5/7] osc copypac from project:KDE:Qt:5.13 package:libqt5-qttools revision:14 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=16 --- libqt5-qttools.changes | 7 ------- libqt5-qttools.spec | 26 +++++--------------------- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index 7a4bccb..f225de0 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Thu Aug 29 17:41:21 UTC 2019 - Stefan Brüns - -- Remove the accidental dependency from the devel package on the - Qt Designer example plugins, referenced in the cmake files. -- Move the example plugins to a separate subpackage. - ------------------------------------------------------------------- Thu Aug 29 14:12:56 UTC 2019 - Christophe Giboudeaux diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 750a1c9..1346e12 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -77,14 +77,16 @@ and several more. %package devel Summary: Development files for the Qt5 Tools library Group: Development/Libraries/X11 +Requires: %{name} = %{version} +%if %{with qdoc} +Requires: %{name}-doc = %{version} +%endif Requires: libQt5Designer5 = %{version} Requires: libQt5DesignerComponents5 = %{version} Requires: libQt5Help5 = %{version} Requires: libqt5-linguist-devel = %{version} Requires: libxslt-devel Requires: pkgconfig(Qt5Xml) >= %{so_version} -Recommends: %{name} = %{version} -Recommends: %{name}-doc = %{version} %description devel You need this package if you want to compile programs with qttools. @@ -109,14 +111,6 @@ Recommends: %{name}-devel %description examples Examples for the libqt5-qttools module. -%package example-plugins -Summary: Example plugins for Qt5 Designer -Group: Development/Libraries/X11 -Recommends: %{name}-examples - -%description example-plugins -Example plugins for Qt5 Designer, e.g. a TicTacToe and a World Clock widget. - %package -n libQt5Designer5 Summary: Qt 5 Designer Library Group: Development/Libraries/X11 @@ -237,10 +231,6 @@ for i in * ; do done popd -# Do not add dependencies on the implementation of the abstract Designer plugin -# interface provided by the plugins, QTCREATORBUG-22886 -rm %{buildroot}%{_libqt5_libdir}/cmake/Qt5Designer/Qt5Designer_*Plugin.cmake - install -D -m644 %{SOURCE11} %{buildroot}%{_datadir}/applications/designer5.desktop install -D -m644 %{SOURCE12} %{buildroot}%{_datadir}/applications/linguist5.desktop install -D -m644 %{SOURCE13} %{buildroot}%{_datadir}/applications/assistant5.desktop @@ -285,8 +275,7 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %{_datadir}/icons/hicolor/*/apps/assistant5.png %{_datadir}/icons/hicolor/*/apps/designer5.png %{_datadir}/icons/hicolor/*/apps/qdbusviewer5.png -%dir %{_libqt5_libdir}/qt5/plugins/designer -%{_libqt5_libdir}/qt5/plugins/designer/libqquickwidget.so +%{_libqt5_libdir}/qt5/plugins/designer %files -n libqt5-linguist %license LICENSE.* @@ -373,9 +362,4 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %license LICENSE.* %{_libqt5_examplesdir}/ -%files example-plugins -%license LICENSE.* -%{_libqt5_libdir}/qt5/plugins/designer -%exclude %{_libqt5_libdir}/qt5/plugins/designer/libqquickwidget.so - %changelog From 5265339c26a4c7ef29af40e16d4fda7314b466b4fd67d5ba0fe8310f41ab116c Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 2 Sep 2019 11:25:40 +0000 Subject: [PATCH 6/7] Let's undo the revert, a missing .cmake file isn't that severe OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=17 --- libqt5-qttools.changes | 7 +++++++ libqt5-qttools.spec | 26 +++++++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index f225de0..7a4bccb 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 29 17:41:21 UTC 2019 - Stefan Brüns + +- Remove the accidental dependency from the devel package on the + Qt Designer example plugins, referenced in the cmake files. +- Move the example plugins to a separate subpackage. + ------------------------------------------------------------------- Thu Aug 29 14:12:56 UTC 2019 - Christophe Giboudeaux diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 1346e12..750a1c9 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -77,16 +77,14 @@ and several more. %package devel Summary: Development files for the Qt5 Tools library Group: Development/Libraries/X11 -Requires: %{name} = %{version} -%if %{with qdoc} -Requires: %{name}-doc = %{version} -%endif Requires: libQt5Designer5 = %{version} Requires: libQt5DesignerComponents5 = %{version} Requires: libQt5Help5 = %{version} Requires: libqt5-linguist-devel = %{version} Requires: libxslt-devel Requires: pkgconfig(Qt5Xml) >= %{so_version} +Recommends: %{name} = %{version} +Recommends: %{name}-doc = %{version} %description devel You need this package if you want to compile programs with qttools. @@ -111,6 +109,14 @@ Recommends: %{name}-devel %description examples Examples for the libqt5-qttools module. +%package example-plugins +Summary: Example plugins for Qt5 Designer +Group: Development/Libraries/X11 +Recommends: %{name}-examples + +%description example-plugins +Example plugins for Qt5 Designer, e.g. a TicTacToe and a World Clock widget. + %package -n libQt5Designer5 Summary: Qt 5 Designer Library Group: Development/Libraries/X11 @@ -231,6 +237,10 @@ for i in * ; do done popd +# Do not add dependencies on the implementation of the abstract Designer plugin +# interface provided by the plugins, QTCREATORBUG-22886 +rm %{buildroot}%{_libqt5_libdir}/cmake/Qt5Designer/Qt5Designer_*Plugin.cmake + install -D -m644 %{SOURCE11} %{buildroot}%{_datadir}/applications/designer5.desktop install -D -m644 %{SOURCE12} %{buildroot}%{_datadir}/applications/linguist5.desktop install -D -m644 %{SOURCE13} %{buildroot}%{_datadir}/applications/assistant5.desktop @@ -275,7 +285,8 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %{_datadir}/icons/hicolor/*/apps/assistant5.png %{_datadir}/icons/hicolor/*/apps/designer5.png %{_datadir}/icons/hicolor/*/apps/qdbusviewer5.png -%{_libqt5_libdir}/qt5/plugins/designer +%dir %{_libqt5_libdir}/qt5/plugins/designer +%{_libqt5_libdir}/qt5/plugins/designer/libqquickwidget.so %files -n libqt5-linguist %license LICENSE.* @@ -362,4 +373,9 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %license LICENSE.* %{_libqt5_examplesdir}/ +%files example-plugins +%license LICENSE.* +%{_libqt5_libdir}/qt5/plugins/designer +%exclude %{_libqt5_libdir}/qt5/plugins/designer/libqquickwidget.so + %changelog From 8eea539aef1374af2cbb40a6c67dd7040866abde96cc9f38f4d93997347fcc99 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 3 Sep 2019 15:15:53 +0000 Subject: [PATCH 7/7] Accepting request 728012 from home:Vogtinator:branches:KDE:Qt:5.13 - Split qcollectiongenerator and qhelpgenerator into a subpackage which is required by the Qt5Help cmake module OBS-URL: https://build.opensuse.org/request/show/728012 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=18 --- libqt5-qttools.changes | 6 ++++++ libqt5-qttools.spec | 22 ++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index 7a4bccb..aff0873 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 3 13:05:02 UTC 2019 - Fabian Vogt + +- Split qcollectiongenerator and qhelpgenerator into a subpackage + which is required by the Qt5Help cmake module + ------------------------------------------------------------------- Thu Aug 29 17:41:21 UTC 2019 - Stefan Brüns diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 750a1c9..741b07f 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -63,6 +63,7 @@ BuildRequires: xz Requires: libQt5Sql5-sqlite >= %{version} Requires: libqt5-qdbus = %{version} Requires: libqt5-qtpaths = %{version} +Requires: %{name}-qhelpgenerator = %{version} %requires_ge libQt5DBus5 %description @@ -83,6 +84,7 @@ Requires: libQt5Help5 = %{version} Requires: libqt5-linguist-devel = %{version} Requires: libxslt-devel Requires: pkgconfig(Qt5Xml) >= %{so_version} +Requires: %{name}-qhelpgenerator = %{version} Recommends: %{name} = %{version} Recommends: %{name}-doc = %{version} @@ -144,6 +146,15 @@ Group: Development/Libraries/X11 %description -n libQt5Help5 The Qt 5 Help library. +%package qhelpgenerator +Summary: Generator for Qt5 Help files (qch) +Group: Development/Libraries/X11 +# help files are SQLite databases, so assistant/qhelpgenerator need the SQLite plugin +Requires: libQt5Sql5-sqlite >= %{version} + +%description qhelpgenerator +Binaries for generating .qch help catalogs. + %package -n libqt5-linguist Summary: Qt 5 Linguist Tools Group: Development/Libraries/X11 @@ -260,22 +271,18 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %{_bindir}/designer* %{_bindir}/pixeltool* %{_bindir}/qdbusviewer* -%{_bindir}/qhelpgenerator* %{_bindir}/qtdiag* %{_bindir}/qtplugininfo* %{_bindir}/qtattributionsscanner* %{_bindir}/qdistancefieldgenerator* -%{_bindir}/qcollectiongenerator* %{_libqt5_bindir}/assistant* %{_libqt5_bindir}/designer* %{_libqt5_bindir}/pixeltool* %{_libqt5_bindir}/qdbusviewer* -%{_libqt5_bindir}/qhelpgenerator* %{_libqt5_bindir}/qtdiag* %{_libqt5_bindir}/qtplugininfo* %{_libqt5_bindir}/qtattributionsscanner* %{_libqt5_bindir}/qdistancefieldgenerator -%{_libqt5_bindir}/qcollectiongenerator* %{_datadir}/applications/assistant5.desktop %{_datadir}/applications/designer5.desktop %{_datadir}/applications/qdbusviewer5.desktop @@ -340,6 +347,13 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %{_libqt5_bindir}/qdoc* %endif +%files qhelpgenerator +%license LICENSE.* +%{_bindir}/qhelpgenerator* +%{_bindir}/qcollectiongenerator* +%{_libqt5_bindir}/qhelpgenerator* +%{_libqt5_bindir}/qcollectiongenerator* + %files private-headers-devel %license LICENSE.* %{_libqt5_includedir}/QtDesigner/%{so_version}