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