1
0

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
This commit is contained in:
Fabian Vogt 2019-09-02 11:25:40 +00:00 committed by Git OBS Bridge
parent d29ed8460d
commit 5265339c26
2 changed files with 28 additions and 5 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Aug 29 17:41:21 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- 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 <christophe@krop.fr> Thu Aug 29 14:12:56 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -77,16 +77,14 @@ and several more.
%package devel %package devel
Summary: Development files for the Qt5 Tools library Summary: Development files for the Qt5 Tools library
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Requires: %{name} = %{version}
%if %{with qdoc}
Requires: %{name}-doc = %{version}
%endif
Requires: libQt5Designer5 = %{version} Requires: libQt5Designer5 = %{version}
Requires: libQt5DesignerComponents5 = %{version} Requires: libQt5DesignerComponents5 = %{version}
Requires: libQt5Help5 = %{version} Requires: libQt5Help5 = %{version}
Requires: libqt5-linguist-devel = %{version} Requires: libqt5-linguist-devel = %{version}
Requires: libxslt-devel Requires: libxslt-devel
Requires: pkgconfig(Qt5Xml) >= %{so_version} Requires: pkgconfig(Qt5Xml) >= %{so_version}
Recommends: %{name} = %{version}
Recommends: %{name}-doc = %{version}
%description devel %description devel
You need this package if you want to compile programs with qttools. You need this package if you want to compile programs with qttools.
@ -111,6 +109,14 @@ Recommends: %{name}-devel
%description examples %description examples
Examples for the libqt5-qttools module. 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 %package -n libQt5Designer5
Summary: Qt 5 Designer Library Summary: Qt 5 Designer Library
Group: Development/Libraries/X11 Group: Development/Libraries/X11
@ -231,6 +237,10 @@ for i in * ; do
done done
popd 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 %{SOURCE11} %{buildroot}%{_datadir}/applications/designer5.desktop
install -D -m644 %{SOURCE12} %{buildroot}%{_datadir}/applications/linguist5.desktop install -D -m644 %{SOURCE12} %{buildroot}%{_datadir}/applications/linguist5.desktop
install -D -m644 %{SOURCE13} %{buildroot}%{_datadir}/applications/assistant5.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/assistant5.png
%{_datadir}/icons/hicolor/*/apps/designer5.png %{_datadir}/icons/hicolor/*/apps/designer5.png
%{_datadir}/icons/hicolor/*/apps/qdbusviewer5.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 %files -n libqt5-linguist
%license LICENSE.* %license LICENSE.*
@ -362,4 +373,9 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{
%license LICENSE.* %license LICENSE.*
%{_libqt5_examplesdir}/ %{_libqt5_examplesdir}/
%files example-plugins
%license LICENSE.*
%{_libqt5_libdir}/qt5/plugins/designer
%exclude %{_libqt5_libdir}/qt5/plugins/designer/libqquickwidget.so
%changelog %changelog