From 4b057feb14fd36288c390e2e413ba511c5c7f58db411fce1af8804cd0c33cc3c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 2 Sep 2019 11:19:05 +0000 Subject: [PATCH] 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