Accepting request 611686 from KDE:Qt5

Qt 5.11.0 (forwarded request 611396 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/611686
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qttools?expand=0&rev=36

fix-for-opensuse-qmake-qt5.patch

@@ -1,6 +1,6 @@
-diff -ru src.org/linguist/lrelease/main.cpp src/linguist/lrelease/main.cpp
+diff -ru a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp
---- src.org/linguist/lrelease/main.cpp  2014-12-06 00:24:59.000000000 +0800
+--- a/src/linguist/lrelease/main.cpp  2014-12-06 00:24:59.000000000 +0800
-+++ src/linguist/lrelease/main.cpp      2015-01-12 10:50:16.717756760 +0800
++++ b/src/linguist/lrelease/main.cpp      2015-01-12 10:50:16.717756760 +0800
 @@ -310,9 +310,9 @@
              option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
              if (option.qmake_abslocation.isEmpty())
@@ -13,9 +13,9 @@ diff -ru src.org/linguist/lrelease/main.cpp src/linguist/lrelease/main.cpp
  #endif
              option.initProperties();
              QMakeVfs vfs;
-diff -ru src.org/linguist/lupdate/main.cpp src/linguist/lupdate/main.cpp
+diff -ru a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
---- src.org/linguist/lupdate/main.cpp   2014-12-06 00:24:59.000000000 +0800
+--- a/src/linguist/lupdate/main.cpp   2014-12-06 00:24:59.000000000 +0800
-+++ src/linguist/lupdate/main.cpp       2015-01-12 10:50:16.718756760 +0800
++++ b/src/linguist/lupdate/main.cpp       2015-01-12 10:50:16.718756760 +0800
 @@ -1048,7 +1048,7 @@
          ProFileGlobals option;
          option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));

libqt5-qttools.changes

@@ -1,3 +1,75 @@
+-------------------------------------------------------------------
+Tue May 22 16:14:06 CEST 2018 - fabian@ritter-vogt.de
+
+- Update to 5.11.0
+  * New bugfix release
+  * For more details please see:
+  * http://code.qt.io/cgit/qt/qttools.git/plain/dist/changes-5.11.0/?h=v5.11.0
+- Drop revert-static-libclang.patch
+
+-------------------------------------------------------------------
+Tue May  8 11:01:40 CEST 2018 - fabian@ritter-vogt.de
+
+- Update to 5.11.0-rc
+  * New bugfix release
+  * No changelog available
+- Add patch to support dynamic linking against LLVM and clang again:
+  * revert-static-libclang.patch
+- Convert to patch -p1 format:
+  * fix-for-opensuse-qmake-qt5.patch
+
+-------------------------------------------------------------------
+Mon Apr 23 08:58:02 CEST 2018 - fabian@ritter-vogt.de
+
+- Update to 5.11.0-beta4
+  * New bugfix release
+  * No changelog available
+
+-------------------------------------------------------------------
+Wed Apr 11 09:15:01 CEST 2018 - fabian@ritter-vogt.de
+
+- Update to 5.11.0-beta3
+  * New bugfix release
+  * No changelog available
+
+-------------------------------------------------------------------
+Wed Mar 28 09:17:50 CEST 2018 - fabian@ritter-vogt.de
+
+- Update to 5.11.0-beta2
+  * New bugfix release
+  * No changelog available
+
+-------------------------------------------------------------------
+Tue Mar 13 13:40:50 UTC 2018 - christophe@krop.fr
+
+- Fix the license tag.
+
+-------------------------------------------------------------------
+Thu Mar  1 09:55:50 CET 2018 - fabian@ritter-vogt.de
+
+- Update to 5.11.0-beta1
+  * New feature release
+  * For more details please see:
+  * http://code.qt.io/cgit/qt/qttools.git/plain/dist/changes-5.11.0-beta1/?h=v5.11.0-beta1
+
+-------------------------------------------------------------------
+Tue Feb 20 14:29:38 CET 2018 - fabian@ritter-vogt.de
+
+- Update to 5.11.0-alpha
+  * New feature release
+  * For more details please see:
+  * https://wiki.qt.io/New_Features_in_Qt_5.11
+* qdoc needs clang which is not available on 42.x.
+  Don't require it there.
+
+-------------------------------------------------------------------
+Wed Feb 14 15:47:07 CET 2018 - fabian@ritter-vogt.de
+
+- Update to 5.10.1
+  * New bugfix release
+  * For more details please see:
+  * http://code.qt.io/cgit/qt/qttools.git/plain/dist/changes-5.10.1/?h=v5.10.1
+
 -------------------------------------------------------------------
 Fri Dec  8 23:14:04 UTC 2017 - christophe@krop.fr
 

libqt5-qttools.spec

@@ -15,21 +15,27 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%if 0%{?suse_version} >= 1330
+%bcond_without qdoc
+%else
+# Needs clang >= 3.6.2
+%bcond_with qdoc
+%endif
 
 %define qt5_snapshot 0
 
 Name:           libqt5-qttools
-Version:        5.10.0
+Version:        5.11.0
 Release:        0
 Summary:        Qt 5 QtTools Module
-License:        LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-with-Qt-Company-Qt-exception-1.1
+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.10.0
+%define real_version 5.11.0
-%define so_version 5.10.0
+%define so_version 5.11.0
-%define tar_version qttools-everywhere-src-5.10.0
+%define tar_version qttools-everywhere-src-5.11.0
-Source:         https://download.qt.io/official_releases/qt/5.10/%{real_version}/submodules/%{tar_version}.tar.xz
+Source:         https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz
 Source1:        baselibs.conf
 Source11:       designer5.desktop
 Source12:       linguist5.desktop
@@ -39,7 +45,9 @@ 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}
+%if %{with qdoc}
+BuildRequires:  clang-devel >= 3.6.2
+%endif
 BuildRequires:  libqt5-qtbase-devel >= %{version}
 BuildRequires:  libqt5-qtbase-private-headers-devel >= %{version}
 BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= %{version}
@@ -68,13 +76,15 @@ This package contains base tools, like string, xml, and network handling.
 
 %prep
 %setup -q -n %{tar_version}
-%patch0 -p0
+%autopatch -p1
 
 %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}
@@ -325,11 +335,13 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{
 %{_bindir}/qtpaths
 %{_libqt5_bindir}/qtpaths
 
+%if %{with qdoc}
 %files doc
 %defattr(-,root,root,755)
 %doc LICENSE.*
 %{_bindir}/qdoc*
 %{_libqt5_bindir}/qdoc*
+%endif
 
 %files private-headers-devel
 %defattr(-,root,root,755)

qttools-everywhere-src-5.10.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ff5dc747b7935de85257673424dfdffb231f3409f09a5f833d37e2f625cfe32
-size 9822240

qttools-everywhere-src-5.11.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d93ca84272cdf9031913cb3a6876716aa8a174e91693839f0de0ea3dd3a67d9
+size 9678000