From ae4d9db1e8ab60d85f286a5506e85c99ce0af5cd6f323b84433e0501cf0da51f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 17 May 2016 15:05:47 +0000 Subject: [PATCH] Accepting request 379839 from KDE:Qt5 Update to 5.6.0 OBS-URL: https://build.opensuse.org/request/show/379839 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qttools?expand=0&rev=26 --- libqt5-qttools.changes | 8 ++++++++ libqt5-qttools.spec | 28 ++++++++++++++++++++++------ qttools-opensource-src-5.5.1.tar.xz | 3 --- qttools-opensource-src-5.6.0.tar.xz | 3 +++ 4 files changed, 33 insertions(+), 9 deletions(-) delete mode 100644 qttools-opensource-src-5.5.1.tar.xz create mode 100644 qttools-opensource-src-5.6.0.tar.xz diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index eade45f..5c7be9b 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Mar 18 19:03:26 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.0 + * For more details please see: + http://blog.qt.io/blog/2016/03/16/qt-5-6-released/ + and https://wiki.qt.io/New_Features_in_Qt_5.6 + ------------------------------------------------------------------- Fri Oct 16 20:22:36 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 6ae3205..25fe4fb 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qttools # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,15 +19,15 @@ %define qt5_snapshot 0 Name: libqt5-qttools -Version: 5.5.1 +Version: 5.6.0 Release: 0 Summary: Qt 5 QtTools Module License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Development/Libraries/X11 Url: http://qt.digia.com %define base_name libqt5 -%define real_version 5.5.1 -%define so_version 5.5.1 +%define real_version 5.6.0 +%define so_version 5.6.0 %define tar_version qttools-opensource-src-%{real_version} Source: %{tar_version}.tar.xz Source1: baselibs.conf @@ -39,7 +39,7 @@ Source99: libqt5-qttools-rpmlintrc # PATCH-FIX-OPENSUSE fix-for-opensuse-qmake-qt5.patch [rh#1009893] liujianfeng1994@gmail.com Patch0: fix-for-opensuse-qmake-qt5.patch BuildRequires: fdupes -BuildRequires: libQt5WebKitWidgets-devel >= %{version} +#BuildRequires: libQt5WebKitWidgets-devel >= %{version} BuildRequires: libqt5-qtbase-devel >= %{version} BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} @@ -71,6 +71,7 @@ This package contains base tools, like string, xml, and network handling. Summary: Qt Development Kit Group: Development/Libraries/X11 Requires: %{name} = %{version} +Requires: %{name}-doc = %{version} Requires: libQt5CLucene5 = %{version} Requires: libQt5Designer5 = %{version} Requires: libQt5DesignerComponents5 = %{version} @@ -157,6 +158,15 @@ Requires: pkgconfig(Qt5Core) >= %{version} %description -n libqt5-linguist-devel The Qt 5 Linguist Tools - development files. +%package doc +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} + +%description doc +Qt 5 tool used by Qt Developers to generate documentation for software projects. + %post -p /sbin/ldconfig %post -n libQt5CLucene5 -p /sbin/ldconfig @@ -199,7 +209,7 @@ mkdir -p %{buildroot}%{_bindir} pushd %{buildroot}%{_libqt5_bindir} for i in * ; do case "${i}" in - assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator) + assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qdoc|qhelpconverter|qhelpgenerator) mv $i ../../../bin/${i}-qt5 ln -s ../../../bin/${i}-qt5 . ln -s ../../../bin/${i}-qt5 $i @@ -304,6 +314,12 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ %{_libqt5_libdir}/cmake/Qt5LinguistTools/ %{_datadir}/qt5/phrasebooks +%files doc +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{_bindir}/qdoc* +%{_libqt5_bindir}/qdoc* + %files private-headers-devel %defattr(-,root,root,755) %doc LGPL_EXCEPTION.txt LICENSE.* diff --git a/qttools-opensource-src-5.5.1.tar.xz b/qttools-opensource-src-5.5.1.tar.xz deleted file mode 100644 index 3c01f4c..0000000 --- a/qttools-opensource-src-5.5.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd -size 9327100 diff --git a/qttools-opensource-src-5.6.0.tar.xz b/qttools-opensource-src-5.6.0.tar.xz new file mode 100644 index 0000000..facfa75 --- /dev/null +++ b/qttools-opensource-src-5.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d244c61bbe5505cb94310e980b06ef13dd573511e80ccbdc060f71d5462219d +size 9817788