Accepting request 557404 from KDE:Qt5

Qt 5.10.0

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

fix-for-opensuse-qmake-qt5.patch

@@ -1,8 +1,7 @@
-Index: src/linguist/lrelease/main.cpp
+diff -ru src.org/linguist/lrelease/main.cpp src/linguist/lrelease/main.cpp
-===================================================================
+--- src.org/linguist/lrelease/main.cpp  2014-12-06 00:24:59.000000000 +0800
---- src/linguist/lrelease/main.cpp.orig
++++ src/linguist/lrelease/main.cpp      2015-01-12 10:50:16.717756760 +0800
-+++ src/linguist/lrelease/main.cpp
+@@ -310,9 +310,9 @@
-@@ -305,9 +305,9 @@ int main(int argc, char **argv)
              option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
              if (option.qmake_abslocation.isEmpty())
  #ifdef QT_BOOTSTRAPPED
@@ -14,11 +13,10 @@ Index: src/linguist/lrelease/main.cpp
  #endif
              option.initProperties();
              QMakeVfs vfs;
-Index: src/linguist/lupdate/main.cpp
+diff -ru src.org/linguist/lupdate/main.cpp src/linguist/lupdate/main.cpp
-===================================================================
+--- src.org/linguist/lupdate/main.cpp   2014-12-06 00:24:59.000000000 +0800
---- src/linguist/lupdate/main.cpp.orig
++++ src/linguist/lupdate/main.cpp       2015-01-12 10:50:16.718756760 +0800
-+++ src/linguist/lupdate/main.cpp
+@@ -1048,7 +1048,7 @@
-@@ -1126,7 +1126,7 @@ int main(int argc, char **argv)
          ProFileGlobals option;
          option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
          if (option.qmake_abslocation.isEmpty())

libqt5-qttools.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Dec  8 23:14:04 UTC 2017 - christophe@krop.fr
+
+- Update the license tag (boo#967696)
+
+-------------------------------------------------------------------
+Thu Dec  7 12:18:15 UTC 2017 - fabian@ritter-vogt.de
+
+- Update to 5.10.0 final
+  * New bugfix release
+
+-------------------------------------------------------------------
+Sun Dec  3 14:13:00 UTC 2017 - fabian@ritter-vogt.de
+
+- Update to 5.10.0 RC 2
+  * New bugfix release
+
+-------------------------------------------------------------------
+Thu Nov 30 09:47:19 UTC 2017 - fabian@ritter-vogt.de
+
+- Update to 5.10.0 RC 1
+  * New bugfix release
+
 -------------------------------------------------------------------
 Sat Nov 25 12:46:47 UTC 2017 - fabian@ritter-vogt.de
 
@@ -6,6 +29,37 @@ Sat Nov 25 12:46:47 UTC 2017 - fabian@ritter-vogt.de
   * For more details, see:
     http://code.qt.io/cgit/qt/qttools.git/tree/dist/changes-5.9.3/?h=v5.9.3
 
+-------------------------------------------------------------------
+Mon Nov 20 13:54:41 UTC 2017 - tittiatcoke@gmail.com
+
+- Recommend to install the Qt Help files in QCH format
+  to make Qt Assistent usable
+
+-------------------------------------------------------------------
+Wed Nov 15 11:41:53 UTC 2017 - fabian@ritter-vogt.de
+
+- Update to 5.10 Beta 4
+- Contains bugfixes
+
+-------------------------------------------------------------------
+Thu Nov  2 07:22:50 UTC 2017 - fabian@ritter-vogt.de
+
+- Update to 5.10 Beta 3
+- Contains bugfixes
+
+-------------------------------------------------------------------
+Mon Oct 30 16:19:40 UTC 2017 - fabian@ritter-vogt.de
+
+- Update to 5.10 Beta 2
+- Contains bugfixes
+
+-------------------------------------------------------------------
+Mon Oct  9 16:17:41 UTC 2017 - fabian@ritter-vogt.de
+
+- Update to 5.10 Beta 1
+- For more information visit:
+    https://blog.qt.io/blog/2017/10/09/qt-5-10-beta-released/
+
 -------------------------------------------------------------------
 Sun Oct  8 14:10:21 UTC 2017 - lbeltrame@kde.org
 
@@ -13,6 +67,13 @@ Sun Oct  8 14:10:21 UTC 2017 - lbeltrame@kde.org
   * For more details please see:
     https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/
 
+-------------------------------------------------------------------
+Mon Sep 25 14:42:37 CEST 2017 - fabian@ritter-vogt.de
+
+- Update to 5.10 Alpha 1
+- For more information visit:
+    https://blog.qt.io/blog/2017/09/13/qt-5-10-alpha-released/
+
 -------------------------------------------------------------------
 Mon Sep 11 15:58:44 UTC 2017 - jengelh@inai.de
 
@@ -341,4 +402,3 @@ Fri Apr 13 13:22:38 UTC 2012 - stephan.binner@basyskom.com
 Thu Apr  5 09:56:15 UTC 2012 - dmueller@suse.com
 
 - Initial packaging (Qt 5.0 Alpha)
-

libqt5-qttools.spec

@@ -19,17 +19,17 @@
 %define qt5_snapshot 0
 
 Name:           libqt5-qttools
-Version:        5.9.3
+Version:        5.10.0
 Release:        0
 Summary:        Qt 5 QtTools Module
-License:        SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
+License:        LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-with-Qt-Company-Qt-exception-1.1
 Group:          Development/Libraries/X11
 Url:            https://www.qt.io
 %define base_name libqt5
-%define real_version 5.9.3
+%define real_version 5.10.0
-%define so_version 5.9.3
+%define so_version 5.10.0
-%define tar_version qttools-opensource-src-%{real_version}
+%define tar_version qttools-everywhere-src-5.10.0
-Source:         https://download.qt.io/official_releases/qt/5.9/%{real_version}/submodules/%{tar_version}.tar.xz
+Source:         https://download.qt.io/official_releases/qt/5.10/%{real_version}/submodules/%{tar_version}.tar.xz
 Source1:        baselibs.conf
 Source11:       designer5.desktop
 Source12:       linguist5.desktop
@@ -46,6 +46,7 @@ BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= %{version}
 BuildRequires:  libxslt-devel
 BuildRequires:  update-desktop-files
 Recommends:     libqt5-linguist
+Recommends:     libqt5-qtdoc-qch >= %{version}
 %if %qt5_snapshot
 #to create the forwarding headers
 BuildRequires:  perl
@@ -66,7 +67,7 @@ Qt is a set of libraries for developing applications.
 This package contains base tools, like string, xml, and network handling.
 
 %prep
-%setup -q -n qttools-opensource-src-%{real_version}
+%setup -q -n %{tar_version}
 %patch0 -p0
 
 %package devel

qttools-everywhere-src-5.10.0.tar.xz

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

qttools-opensource-src-5.9.3.tar.xz

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