diff --git a/0001-Revert-Bump-version.patch b/0001-Revert-Bump-version.patch deleted file mode 100644 index e502270..0000000 --- a/0001-Revert-Bump-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9ee6217569de30aded022c5418aad38d7c67a3aa Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Tue, 22 Jun 2021 21:35:01 +0200 -Subject: [PATCH] Revert "Bump version" - -This reverts commit 997ff3ad21b9303aa3321a86e5c5b9cfcfc2f807. ---- - .qmake.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.qmake.conf b/.qmake.conf -index a17c06927..a4c27d0e2 100644 ---- a/.qmake.conf -+++ b/.qmake.conf -@@ -6,4 +6,4 @@ load(qt_build_config) - DEFINES += QT_NO_FOREACH - DEFINES += QT_NO_JAVA_STYLE_ITERATORS - --MODULE_VERSION = 5.15.3 -+MODULE_VERSION = 5.15.2 --- -2.20.1 - diff --git a/_service b/_service index 1d7a357..88c6a53 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ enable - 5.15.2+kde@TAG_OFFSET@ + 5.15.5+kde@TAG_OFFSET@ https://invent.kde.org/qt/qt/qt3d.git git qt3d-everywhere-src kde/5.15 - v5.15.2 + v5.15.5-lts-lgpl enable diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index f8fca03..2b11376 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 27 13:08:59 UTC 2022 - Fabian Vogt + +- Update to version 5.15.5+kde15, rebased upstream: + * Revert "Update commercial license headers" + * Update commercial license headers +- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now + ------------------------------------------------------------------- Fri Jan 21 08:11:56 UTC 2022 - Fabian Vogt diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index c243714..80e7a67 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -21,12 +21,12 @@ %define qt5_snapshot 1 %define libname libQt53DCore5 %define base_name libqt5 -%define real_version 5.15.2 -%define so_version 5.15.2 +%define real_version 5.15.5 +%define so_version 5.15.5 %define tar_version qt3d-everywhere-src-%{version} %global enable_assimp (0%{?suse_version} >= 1550) Name: libqt5-qt3d -Version: 5.15.2+kde39 +Version: 5.15.5+kde15 Release: 0 Summary: Qt 5 3D Addon # Legal: some files are GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -35,8 +35,6 @@ 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: %{tar_version}.tar.xz -# PATCH-FIX-OPENSUSE -Patch1: 0001-Revert-Bump-version.patch BuildRequires: fdupes BuildRequires: libQt5Bootstrap-devel-static >= %{real_version} BuildRequires: libQt5Concurrent-devel >= %{real_version} diff --git a/qt3d-everywhere-src-5.15.2+kde39.obscpio b/qt3d-everywhere-src-5.15.2+kde39.obscpio deleted file mode 100644 index 2fb794d..0000000 --- a/qt3d-everywhere-src-5.15.2+kde39.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b37f818957b9fb51030495932963a7e7ad85945782e94e9af8439d97a3ec2f2 -size 119878670 diff --git a/qt3d-everywhere-src-5.15.5+kde15.obscpio b/qt3d-everywhere-src-5.15.5+kde15.obscpio new file mode 100644 index 0000000..e045d7b --- /dev/null +++ b/qt3d-everywhere-src-5.15.5+kde15.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b225751b065bc6409bdedb3b67fff60d69f5ec9424d86bccfa4d3b03369c9772 +size 119878670 diff --git a/qt3d-everywhere-src.obsinfo b/qt3d-everywhere-src.obsinfo index 5116b6d..c4ca3e2 100644 --- a/qt3d-everywhere-src.obsinfo +++ b/qt3d-everywhere-src.obsinfo @@ -1,4 +1,4 @@ name: qt3d-everywhere-src -version: 5.15.2+kde39 -mtime: 1638341627 -commit: dba14d48611b9e9d59576172658779ab4a39b416 +version: 5.15.5+kde15 +mtime: 1655460882 +commit: 3cc801c4ae41ff3f155258c4bf7e21bb5b3f6a3d