OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtwayland?expand=0&rev=7

libqt5-qtwayland.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 16 09:42:21 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update the license tags.
+
 -------------------------------------------------------------------
 Thu Dec 12 12:55:17 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
 

libqt5-qtwayland.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libqt5-qtwayland
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -26,9 +26,10 @@ Name:           libqt5-qtwayland
 Version:        5.14.0
 Release:        0
 Summary:        Qt 5 Wayland Addon
-License:        (LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only) AND GPL-3.0-only
+# The wayland compositor files are GPL-3.0-or-later
+License:        GPL-3.0-or-later AND (LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later))
 Group:          Development/Libraries/X11
-Url:            https://www.qt.io
+URL:            https://www.qt.io
 Source:         https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-UPSTREAM
@@ -38,11 +39,8 @@ Patch100:       fix-return-nonvoid-function.patch
 BuildRequires:  fdupes
 BuildRequires:  libqt5-qtbase-private-headers-devel >= %{version}
 BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= %{version}
+BuildRequires:  pkgconfig
 BuildRequires:  xz
-%if 0%{?suse_version} < 1330
-# It does not build with the default compiler (GCC 4.8) on Leap 42.x
-BuildRequires:  gcc7-c++
-%endif
 BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(wayland-client) >= 1.1.0
 BuildRequires:  pkgconfig(wayland-egl)
@@ -50,6 +48,10 @@ BuildRequires:  pkgconfig(wayland-server) >= 1.1.0
 BuildRequires:  pkgconfig(xcomposite)
 BuildRequires:  pkgconfig(xkbcommon) >= 0.2.0
 Conflicts:      qtwayland
+%if 0%{?suse_version} < 1330
+# It does not build with the default compiler (GCC 4.8) on Leap 42.x
+BuildRequires:  gcc7-c++
+%endif
 %if %{qt5_snapshot}
 #to create the forwarding headers
 BuildRequires:  perl
@@ -72,9 +74,9 @@ Development package to build Qt-based compositors.
 %package private-headers-devel
 Summary:        Qt 5 Wayland Addon Non-ABI stable experimental API files
 Group:          Development/Libraries/C and C++
-BuildArch:      noarch
 Requires:       %{name}-devel = %{version}
 Requires:       libqt5-qtbase-private-headers-devel
+BuildArch:      noarch
 
 %description private-headers-devel
 This package provides private headers of libqt5-qtwayland that are normally
@@ -101,6 +103,7 @@ Qt is a set of libraries for developing applications.
 %package examples
 Summary:        Qt5 wayland examples
 Group:          Development/Libraries/X11
+License:        BSD-3-Clause
 Recommends:     %{name}-devel
 
 %description examples
@@ -110,15 +113,10 @@ Examples for libqt5-qtwayland module.
 %autosetup -p1 -n %{tar_version}
 
 %post  -n libQt5WaylandCompositor5 -p /sbin/ldconfig
-
 %postun -n libQt5WaylandCompositor5 -p /sbin/ldconfig
-
 %post  -n libQt5WaylandClient5 -p /sbin/ldconfig
-
 %postun -n libQt5WaylandClient5 -p /sbin/ldconfig
-
 %post   -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %build
@@ -137,10 +135,10 @@ mkdir .git
     export CXX=g++-7
 %endif
 
-%{make_jobs}
+%make_jobs
 
 %install
-%{qmake5_install}
+%qmake5_install
 
 find %{buildroot}%{_libdir} -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
 find %{buildroot}%{_libdir}/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
@@ -156,7 +154,7 @@ fdupes -s %{buildroot}
 %{_libqt5_archdatadir}/qml/QtWayland/
 
 %files -n libQt5WaylandCompositor5
-%license  LICENSE.*
+%license LICENSE.*
 %{_libqt5_libdir}/libQt5WaylandCompositor.so.*
 
 %files -n libQt5WaylandClient5