diff --git a/0001-Revert-Bump-version.patch b/0001-Revert-Bump-version.patch new file mode 100644 index 0000000..ca3ef47 --- /dev/null +++ b/0001-Revert-Bump-version.patch @@ -0,0 +1,25 @@ +From 12975b72d6f549cd3da9a56e8d14c84a3c578602 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Tue, 22 Jun 2021 21:38:50 +0200 +Subject: [PATCH] Revert "Bump version" + +This reverts commit 6ad9a687da69d54adf59e47ba285b9697a83b447. +--- + .qmake.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.qmake.conf b/.qmake.conf +index 13d3ec1d..7f986544 100644 +--- a/.qmake.conf ++++ b/.qmake.conf +@@ -2,6 +2,6 @@ load(qt_build_config) + + DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST + +-MODULE_VERSION = 5.15.3 ++MODULE_VERSION = 5.15.2 + CONFIG += warning_clean + CMAKE_MODULE_TESTS=- +-- +2.20.1 + diff --git a/_service b/_service new file mode 100644 index 0000000..f619ce2 --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + enable + 5.15.2+kde@TAG_OFFSET@ + https://invent.kde.org/qt/qt/qtdatavis3d.git + git + qtdatavis3d-everywhere-src + kde/5.15 + v5.15.2 + enable + + + + + *.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..9f96ba8 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://invent.kde.org/qt/qt/qtdatavis3d.git + c085311c02dd216e5a041b90c164d55b3cf3ce92 \ No newline at end of file diff --git a/libqt5-qtdatavis3d.changes b/libqt5-qtdatavis3d.changes index d7dab8c..5ffc2db 100644 --- a/libqt5-qtdatavis3d.changes +++ b/libqt5-qtdatavis3d.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jun 22 19:38:51 UTC 2021 - Fabian Vogt + +- Switch to KDE's maintenance branch +- Update to version 5.15.2+kde2: + * Add changes file for Qt 5.15.2 + * Bump version +- Add patch to reset version to 5.15.2: + * 0001-Revert-Bump-version.patch + ------------------------------------------------------------------- Sat Jan 16 16:25:01 UTC 2021 - Fabian Vogt diff --git a/libqt5-qtdatavis3d.spec b/libqt5-qtdatavis3d.spec index 438b8a5..2b68d7e 100644 --- a/libqt5-qtdatavis3d.spec +++ b/libqt5-qtdatavis3d.spec @@ -19,22 +19,24 @@ # Internal QML import of examples %global __requires_exclude qmlimport\\(CustomFormatter.* -%define qt5_snapshot 0 +%define qt5_snapshot 1 %define libname libQt5DataVisualization5 %define base_name libqt5 %define real_version 5.15.2 %define so_version 5.15.2 -%define tar_version qtdatavis3d-everywhere-src-5.15.2 +%define tar_version qtdatavis3d-everywhere-src-%{version} Name: libqt5-qtdatavis3d -Version: 5.15.2 +Version: 5.15.2+kde2 Release: 0 Summary: Qt5 Data Visualization 3D License: GPL-3.0-or-later Group: Development/Libraries/X11 URL: https://doc.qt.io/qt-5/qtdatavisualization-index.html -Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz +Source: %{tar_version}.tar.xz +# PATCH-FIX-OPENSUSE +Patch1: 0001-Revert-Bump-version.patch BuildRequires: fdupes -BuildRequires: libqt5-qtdeclarative-devel >= %{version} +BuildRequires: libqt5-qtdeclarative-devel >= %{real_version} %if %{qt5_snapshot} #to create the forwarding headers BuildRequires: perl @@ -62,7 +64,7 @@ Qt5 Data Visualization module provides a way to visualize data in 3D. * Volumetric custom items %prep -%setup -q -n qtdatavis3d-everywhere-src-%{real_version} +%autosetup -p1 -n %{tar_version} %package -n %{libname} Summary: Qt5 Data Visualization module diff --git a/qtdatavis3d-everywhere-src-5.15.2+kde2.obscpio b/qtdatavis3d-everywhere-src-5.15.2+kde2.obscpio new file mode 100644 index 0000000..149fdda --- /dev/null +++ b/qtdatavis3d-everywhere-src-5.15.2+kde2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6fd6a3254b9e76c5e4c2ae73239e943ae035273425a6a6c589bfe2765bb2d87 +size 19770382 diff --git a/qtdatavis3d-everywhere-src-5.15.2.tar.xz b/qtdatavis3d-everywhere-src-5.15.2.tar.xz deleted file mode 100644 index 9104f08..0000000 --- a/qtdatavis3d-everywhere-src-5.15.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd -size 5191436 diff --git a/qtdatavis3d-everywhere-src.obsinfo b/qtdatavis3d-everywhere-src.obsinfo new file mode 100644 index 0000000..6f5b04e --- /dev/null +++ b/qtdatavis3d-everywhere-src.obsinfo @@ -0,0 +1,5 @@ +name: qtdatavis3d-everywhere-src +version: 5.15.2+kde2 +mtime: 1603885577 +commit: c085311c02dd216e5a041b90c164d55b3cf3ce92 +