diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index 536420c..2222061 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Sep 21 07:59:39 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.11.2 + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qttools.git/plain/dist/changes-5.11.2/?h=v5.11.2 +- Add requires_eq for clang to workaround QTBUG-70687 (boo#1109367) +- Use %license, remove %defattr + ------------------------------------------------------------------- Tue Jun 19 10:51:15 CEST 2018 - fabian@ritter-vogt.de diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 0307a13..219982c 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -18,23 +18,23 @@ %if 0%{?suse_version} >= 1330 %bcond_without qdoc %else -# Needs clang >= 3.6.2 +# Needs clang >= 3.9.0 %bcond_with qdoc %endif %define qt5_snapshot 0 Name: libqt5-qttools -Version: 5.11.1 +Version: 5.11.2 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 %define base_name libqt5 -%define real_version 5.11.1 -%define so_version 5.11.1 -%define tar_version qttools-everywhere-src-5.11.1 +%define real_version 5.11.2 +%define so_version 5.11.2 +%define tar_version qttools-everywhere-src-5.11.2 Source: https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf Source11: designer5.desktop @@ -46,7 +46,7 @@ Source99: libqt5-qttools-rpmlintrc Patch0: fix-for-opensuse-qmake-qt5.patch BuildRequires: fdupes %if %{with qdoc} -BuildRequires: clang-devel >= 3.6.2 +BuildRequires: clang-devel >= 3.9.0 %endif BuildRequires: libqt5-qtbase-devel >= %{version} BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} @@ -67,7 +67,6 @@ Requires: libQt5Sql5-sqlite >= %{version} Requires: libqt5-qdbus = %{version} Requires: libqt5-qtpaths = %{version} %requires_ge libQt5DBus5 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Qt is a set of libraries for developing applications. @@ -182,6 +181,8 @@ Summary: Qt 5 tool used by Qt Developers to generate documentation 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 +%requires_eq clang%(rpm -q --qf '%''{version}' clang-devel | cut -d. -f1) %description doc Qt 5 tool used by Qt Developers to generate documentation for software projects. @@ -251,8 +252,7 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png %{buildroot}%{_dat install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qdbusviewer5.png %files -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_bindir}/assistant* %{_bindir}/designer* %{_bindir}/pixeltool* @@ -285,8 +285,7 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %{_libqt5_libdir}/qt5/plugins/designer %files -n libqt5-linguist -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_bindir}/lconvert* %{_bindir}/linguist* %{_bindir}/lrelease* @@ -302,58 +301,49 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %{_datadir}/icons/hicolor/*/apps/linguist5.png %files -n libQt5Designer5 -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt5Designer.so.* %files -n libQt5DesignerComponents5 -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt5DesignerComponents.so.* %files -n libQt5Help5 -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt5Help.so.* %files -n libqt5-linguist-devel -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/cmake/Qt5LinguistTools/ %{_datadir}/qt5/phrasebooks %files -n libqt5-qdbus -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_bindir}/qdbus-qt5 %{_libqt5_bindir}/qdbus %{_libqt5_bindir}/qdbus-qt5 %files -n libqt5-qtpaths -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_bindir}/qtpaths %{_libqt5_bindir}/qtpaths %if %{with qdoc} %files doc -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_bindir}/qdoc* %{_libqt5_bindir}/qdoc* %endif %files private-headers-devel -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_includedir}/QtDesigner/%{so_version} %{_libqt5_includedir}/QtDesignerComponents/%{so_version} %{_libqt5_includedir}/QtHelp/%{so_version} %{_libqt5_includedir}/QtUiTools/%{so_version} %files devel -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %exclude %{_libqt5_includedir}/QtDesigner/%{so_version} %{_libqt5_includedir}/QtDesigner %exclude %{_libqt5_includedir}/QtDesignerComponents/%{so_version} @@ -375,8 +365,7 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %dir %{_datadir}/qt5 %files examples -%defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_examplesdir}/ %changelog diff --git a/qttools-everywhere-src-5.11.1.tar.xz b/qttools-everywhere-src-5.11.1.tar.xz deleted file mode 100644 index a926555..0000000 --- a/qttools-everywhere-src-5.11.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7fb186f92aedb922c4e7f57ff276bbf90caf0087a2a980f704bad9ac44514fe -size 9720996 diff --git a/qttools-everywhere-src-5.11.2.tar.xz b/qttools-everywhere-src-5.11.2.tar.xz new file mode 100644 index 0000000..b5ca540 --- /dev/null +++ b/qttools-everywhere-src-5.11.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0e8332c771958b4aa373ac643d35e2fabb1a2dcdbaca756ebf3d1ace7c631b8 +size 9691816