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