diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 263e90f..bf29a06 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 16 09:53:10 UTC 2019 - Christophe Giboudeaux + +- Update the license tags. + ------------------------------------------------------------------- Thu Dec 12 12:41:44 UTC 2019 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index a34f945..73a0b7c 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtdeclarative # -# 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,25 +12,23 @@ # 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/ # %define qt5_snapshot 0 - %define libname libQtQuick5 - -Name: libqt5-qtdeclarative -Version: 5.14.0 -Release: 0 -Summary: Qt 5 Declarative Library -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.14.0 %define so_version 5.14.0 %define tar_version qtdeclarative-everywhere-src-5.14.0 +Name: libqt5-qtdeclarative +Version: 5.14.0 +Release: 0 +Summary: Qt 5 Declarative Library +License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) +Group: Development/Libraries/X11 +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-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case @@ -42,24 +40,26 @@ BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: libQt5Gui-private-headers-devel >= %{version} BuildRequires: libQt5Test-private-headers-devel >= %{version} BuildRequires: libQt5Widgets-private-headers-devel >= %{version} +BuildRequires: pkgconfig BuildRequires: python3-base +BuildRequires: xz BuildRequires: pkgconfig(Qt5Core) >= %{version} BuildRequires: pkgconfig(Qt5Gui) >= %{version} BuildRequires: pkgconfig(Qt5Network) >= %{version} BuildRequires: pkgconfig(Qt5Sql) >= %{version} BuildRequires: pkgconfig(Qt5Widgets) >= %{version} -%if %qt5_snapshot +%if %{qt5_snapshot} #to create the forwarding headers BuildRequires: perl %endif -BuildRequires: xz + # NOTE recheck this once/if this package gets further splitted -%requires_ge libQt5Core5 -%requires_ge libQt5Gui5 -%requires_ge libQt5Network5 -%requires_ge libQt5Sql5 -%requires_ge libQt5Test5 -%requires_ge libQt5Widgets5 +%requires_ge libQt5Core5 +%requires_ge libQt5Gui5 +%requires_ge libQt5Network5 +%requires_ge libQt5Sql5 +%requires_ge libQt5Test5 +%requires_ge libQt5Widgets5 %description Qt is a set of libraries for developing applications. @@ -71,13 +71,13 @@ handling. %setup -q -n %{tar_version} %autopatch -p1 -%package -n %libname +%package -n %{libname} Summary: Qt 5 Declarative Library Group: Development/Libraries/X11 # Used by QtQuick.LocalStorage Requires: libQt5Sql5-sqlite -%description -n %libname +%description -n %{libname} Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network @@ -86,7 +86,7 @@ handling. %package devel Summary: Qt Development Kit Group: Development/Libraries/X11 -Requires: %libname = %{version} +Requires: %{libname} = %{version} Requires: %{name}-tools = %{version} Provides: libQt5Quick-devel = %{version} Obsoletes: libQt5Quick-devel < %{version} @@ -97,6 +97,7 @@ You need this package, if you want to compile programs with qtdeclarative. %package tools Summary: Qt 5 Declarative Tools Group: Development/Tools/Debuggers +License: GPL-3.0-only %description tools Qt is a set of libraries for developing applications. @@ -106,7 +107,6 @@ This package contains aditional tools for inspecting, testing, viewing, etc, QML %package private-headers-devel Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ -BuildArch: noarch Requires: %{name}-devel = %{version} Requires: libQt5Core-private-headers-devel >= %{version} Requires: libQt5Gui-private-headers-devel >= %{version} @@ -114,6 +114,7 @@ Requires: libQt5Test-private-headers-devel >= %{version} Requires: libQt5Widgets-private-headers-devel >= %{version} Provides: libQt5Quick-private-headers-devel = %{version} Obsoletes: libQt5Quick-private-headers-devel < %{version} +BuildArch: noarch %description private-headers-devel This package provides private headers of libqt5-qtdeclarative that are normally @@ -124,18 +125,18 @@ the exact Qt version. %package examples Summary: Qt5 quick/qml examples Group: Development/Libraries/X11 +License: BSD-3-Clause Recommends: %{name}-devel Recommends: %{name}-tools %description examples Examples for libqt5-qtdeclarative (quick/qml) modules. -%post -n %libname -p /sbin/ldconfig - -%postun -n %libname -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %build -%if %qt5_snapshot +%if %{qt5_snapshot} #force the configure script to generate the forwarding headers (it checks whether .git directory exists) mkdir .git %endif @@ -145,16 +146,16 @@ pushd %{_target_platform} qmake-qt5 .. -- -qml-jit popd -%{__make} %{?_smp_mflags} VERBOSE=1 -C %{_target_platform} +make %{?_smp_mflags} VERBOSE=1 -C %{_target_platform} -%ifarch %ix86 +%ifarch %{ix86} %if 0%{?sle_version:%sle_version} < 150000 # build libQt5Qml with no_sse2 mkdir -p %{_target_platform}-no_sse2 pushd %{_target_platform}-no_sse2 %qmake5 -config no_sse2 .. -- -no-qml-jit -make sub-src-clean -%{__make} %{?_smp_mflags} VERBOSE=1 -C src/qml +make %{?_smp_mflags} sub-src-clean +make %{?_smp_mflags} VERBOSE=1 -C src/qml popd %endif %endif @@ -164,7 +165,7 @@ pushd %{_target_platform} %qmake5_install popd -%ifarch %ix86 +%ifarch %{ix86} %if 0%{?sle_version:%sle_version} < 150000 mkdir -p %{buildroot}%{_libqt5_libdir}//sse2 mv %{buildroot}%{_libqt5_libdir}/libQt5Qml.so.5* %{buildroot}%{_libqt5_libdir}/sse2/ @@ -199,10 +200,10 @@ popd %fdupes -s %{buildroot}%{_libqt5_includedir} %fdupes -s %{buildroot}%{_libqt5_examplesdir} -%files -n %libname +%files -n %{libname} %license LICENSE.* %{_libqt5_libdir}/libQt5Q*.so.* -%ifarch %ix86 +%ifarch %{ix86} %if 0%{?sle_version:%sle_version} < 150000 %{_libqt5_libdir}/sse2/libQt5Q*.so.* %endif