diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index ad78830..34a335d 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 17 10:11:11 UTC 2019 - Christophe Giboudeaux + +- Update the license tags. + ------------------------------------------------------------------- Thu Dec 12 12:39:44 UTC 2019 - Fabian Vogt diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index eecf8b7..ebf8c08 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qt3d # -# 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,25 @@ # 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 libQt53DCore5 - -Name: libqt5-qt3d -Version: 5.14.0 -Release: 0 -Summary: Qt 5 3D Addon -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 qt3d-everywhere-src-5.14.0 +Name: libqt5-qt3d +Version: 5.14.0 +Release: 0 +Summary: Qt 5 3D Addon +# Legal: some files are GPL-3.0-only WITH Qt-GPL-exception-1.0 +# The exception allows applying using these files under the license of the larger project using them +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 BuildRequires: fdupes @@ -40,13 +40,13 @@ BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: libQt5Gui-private-headers-devel >= %{version} BuildRequires: libQt5OpenGLExtensions-devel-static >= %{version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} -BuildRequires: pkgconfig(zlib) - -%if %qt5_snapshot +%if %{qt5_snapshot} #to create the forwarding headers BuildRequires: perl %endif +BuildRequires: pkgconfig BuildRequires: xz +BuildRequires: pkgconfig(zlib) %description Qt is a set of libraries for developing applications. @@ -57,15 +57,15 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica %prep %autosetup -p1 -n %{tar_version} -%package -n %libname +%package -n %{libname} Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 # Removed in Qt3D 5.6 Provides: libQt53dCollision5 = %{version} Obsoletes: libQt53dCollision5 < %{version} -%description -n %libname +%description -n %{libname} Qt is a set of libraries for developing applications. Qt 3D provides functionality for near-realtime simulation @@ -74,7 +74,7 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica %package -n libQt53DInput5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DInput5 Qt is a set of libraries for developing applications. @@ -85,7 +85,7 @@ applications using Qt3D. %package -n libQt53DQuick5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DQuick5 Qt is a set of libraries for developing applications. @@ -95,9 +95,9 @@ This package provides core Qt 3D QML types. %package -n libQt53DQuickRender5 Summary: Qt 5 3D Addon Group: System/Libraries +%requires_ge libQt5Core5 Provides: libQt53DQuickRenderer5 = %{version} Obsoletes: libQt53DQuickRenderer5 < %{version} -%requires_ge libQt5Core5 %description -n libQt53DQuickRender5 Qt is a set of libraries for developing applications. @@ -107,9 +107,9 @@ This package provides Qt 3D QML types for rendering. %package -n libQt53DRender5 Summary: Qt 5 3D Addon Group: System/Libraries +%requires_ge libQt5Core5 Provides: libQt53DRenderer5 = %{version} Obsoletes: libQt53DRenderer5 < %{version} -%requires_ge libQt5Core5 %description -n libQt53DRender5 Qt is a set of libraries for developing applications. @@ -120,7 +120,7 @@ rendering using Qt 3D. %package -n libQt53DQuickInput5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DQuickInput5 Qt is a set of libraries for developing applications. @@ -131,7 +131,7 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica %package -n libQt53DLogic5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DLogic5 Qt is a set of libraries for developing applications. @@ -142,7 +142,7 @@ backend. %package -n libQt53DExtras5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DExtras5 Qt is a set of libraries for developing applications. @@ -153,7 +153,7 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica %package -n libQt53DQuickExtras5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DQuickExtras5 Qt is a set of libraries for developing applications. @@ -164,7 +164,7 @@ simulation systems. %package -n libQt53DAnimation5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DAnimation5 Qt is a set of libraries for developing applications. @@ -175,7 +175,7 @@ simulation systems. %package -n libQt53DQuickAnimation5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DQuickAnimation5 Qt is a set of libraries for developing applications. @@ -186,7 +186,7 @@ simulation systems. %package -n libQt53DQuickScene2D5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DQuickScene2D5 Qt is a set of libraries for developing applications. @@ -197,8 +197,8 @@ simulation systems. %package imports Summary: Qt 5 3D Library - QML imports Group: Development/Libraries/X11 -Supplements: packageand(%{libname}:libQtQuick5) -%requires_ge libQtQuick5 +%requires_ge libQtQuick5 +Supplements: (%{libname} and libQtQuick5) %description imports Qt is a set of libraries for developing applications. @@ -209,6 +209,7 @@ simulation systems. %package examples Summary: Qt5 3D examples Group: Development/Libraries/X11 +License: BSD-3-Clause Recommends: %{name}-devel %description examples @@ -259,9 +260,9 @@ Development files for the Qt 5 QuickRenderer 3D library. %package -n libQt53DRender-devel Summary: Development files for the Qt 5 Renderer 3D library Group: Development/Libraries/X11 -Requires: libQt53DRender5 = %{version} # Qt53DRenderConfig.cmake requires libscene2d.so Requires: libQt53DQuickScene2D5 = %{version} +Requires: libQt53DRender5 = %{version} Provides: libQt53DRenderer-devel = %{version} Obsoletes: libQt53DRenderer-devel < %{version} @@ -327,16 +328,16 @@ Development files for the Qt 5 Logic 3D library. %package devel Summary: Development files for the Qt5 3D library Group: Development/Libraries/X11 +Requires: libQt53DAnimation-devel = %{version} Requires: libQt53DCore-devel = %{version} Requires: libQt53DExtras-devel = %{version} Requires: libQt53DInput-devel = %{version} Requires: libQt53DLogic-devel = %{version} Requires: libQt53DQuick-devel = %{version} +Requires: libQt53DQuickAnimation-devel = %{version} Requires: libQt53DQuickExtras-devel = %{version} Requires: libQt53DQuickInput-devel = %{version} Requires: libQt53DQuickRender-devel = %{version} -Requires: libQt53DAnimation-devel = %{version} -Requires: libQt53DQuickAnimation-devel = %{version} Requires: libQt53DQuickScene2D-devel = %{version} Requires: libQt53DRender-devel = %{version} # Removed in Qt3D 5.6 @@ -349,13 +350,12 @@ You need this package if you want to compile programs with qt3d. %package private-headers-devel Summary: Non-ABI stable experimental API for the Qt5 3D library Group: Development/Libraries/C and C++ -BuildArch: noarch Requires: %{name}-devel = %{version} Requires: libQt5Core-private-headers-devel >= %{version} -Requires: libQt5Core-private-headers-devel >= %{version} Requires: libQt5Gui-private-headers-devel >= %{version} Requires: libQt5OpenGLExtensions-devel-static >= %{version} Requires: libqt5-qtdeclarative-private-headers-devel >= %{version} +BuildArch: noarch %description private-headers-devel This package provides private headers of libqt5-qt3d that are normally @@ -363,58 +363,35 @@ not used by application development and that do not have any ABI or API guarantees. The packages that build against these have to require the exact Qt version. -%post -n %libname -p /sbin/ldconfig - -%postun -n %libname -p /sbin/ldconfig - +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %post -n libQt53DInput5 -p /sbin/ldconfig - %postun -n libQt53DInput5 -p /sbin/ldconfig - %post -n libQt53DQuick5 -p /sbin/ldconfig - %postun -n libQt53DQuick5 -p /sbin/ldconfig - %post -n libQt53DQuickRender5 -p /sbin/ldconfig - %postun -n libQt53DQuickRender5 -p /sbin/ldconfig - %post -n libQt53DRender5 -p /sbin/ldconfig - %postun -n libQt53DRender5 -p /sbin/ldconfig - %post -n libQt53DQuickInput5 -p /sbin/ldconfig - %postun -n libQt53DQuickInput5 -p /sbin/ldconfig - %post -n libQt53DLogic5 -p /sbin/ldconfig - %postun -n libQt53DLogic5 -p /sbin/ldconfig - %post -n libQt53DExtras5 -p /sbin/ldconfig - %postun -n libQt53DExtras5 -p /sbin/ldconfig - %post -n libQt53DAnimation5 -p /sbin/ldconfig - %postun -n libQt53DAnimation5 -p /sbin/ldconfig - %post -n libQt53DQuickAnimation5 -p /sbin/ldconfig - %postun -n libQt53DQuickAnimation5 -p /sbin/ldconfig - %post -n libQt53DQuickScene2D5 -p /sbin/ldconfig - %postun -n libQt53DQuickScene2D5 -p /sbin/ldconfig - %post -n libQt53DQuickExtras5 -p /sbin/ldconfig - %postun -n libQt53DQuickExtras5 -p /sbin/ldconfig %build # -flto breaks CONFIG += resources_big (QTBUG-73834), but resources_big is needed to prevent excessive memory use %define _lto_cflags %{nil} -%if %qt5_snapshot +%if %{qt5_snapshot} #force the configure script to generate the forwarding headers (it checks whether .git directory exists) mkdir .git %endif @@ -437,7 +414,7 @@ for i in * ; do done popd -%files -n %libname +%files -n %{libname} %defattr(-,root,root,755) %license LICENSE.* %{_libqt5_libdir}/libQt53DCore.so.* @@ -464,7 +441,7 @@ popd %dir %{_libqt5_libdir}/qt5/plugins/sceneparsers %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneimport.so %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneexport.so -%if 0%{suse_version} >= 1500 +%if 0%{?suse_version} >= 1500 %{_libqt5_libdir}/qt5/plugins/sceneparsers/libassimpsceneimport.so %endif %dir %{_libqt5_libdir}/qt5/plugins/geometryloaders