diff --git a/0001-Revert-Bump-version.patch b/0001-Revert-Bump-version.patch new file mode 100644 index 0000000..ff44d39 --- /dev/null +++ b/0001-Revert-Bump-version.patch @@ -0,0 +1,23 @@ +From fe880ac83d870e1dfdafb6a472ff43529187e759 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Tue, 22 Jun 2021 21:35:02 +0200 +Subject: [PATCH] Revert "Bump version" + +This reverts commit 7a15000f42c7a3171719727cd056f82a78244ed7. +--- + .qmake.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.qmake.conf b/.qmake.conf +index fc6f10a..cca4cfa 100644 +--- a/.qmake.conf ++++ b/.qmake.conf +@@ -4,4 +4,4 @@ CONFIG += warning_clean + + DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST + +-MODULE_VERSION = 5.15.3 ++MODULE_VERSION = 5.15.2 +-- +2.20.1 + diff --git a/_service b/_service new file mode 100644 index 0000000..6480fad --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + enable + 5.15.2+kde@TAG_OFFSET@ + https://invent.kde.org/qt/qt/qtscxml.git + git + qtscxml-everywhere-src + kde/5.15 + v5.15.2 + enable + + + + + *.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..8f46708 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://invent.kde.org/qt/qt/qtscxml.git + 7a15000f42c7a3171719727cd056f82a78244ed7 \ No newline at end of file diff --git a/baselibs.conf b/baselibs.conf index 9bbf9c9..9129151 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ libQt5Scxml5 libqt5-qtscxml-devel - requires "libQt5Core5- = " + requires "libQt5Scxml5- = " diff --git a/libqt5-qtscxml.changes b/libqt5-qtscxml.changes index 2ef71d7..30c9bc6 100644 --- a/libqt5-qtscxml.changes +++ b/libqt5-qtscxml.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Jun 26 13:36:04 UTC 2021 - Fabian Vogt + +- Fix requirement in baselibs.conf + +------------------------------------------------------------------- +Tue Jun 22 19:35:02 UTC 2021 - Fabian Vogt + +- Switch to KDE's maintenance branch +- Update to version 5.15.2+kde1: + * Bump version +- Add patch to reset version to 5.15.2: + * 0001-Revert-Bump-version.patch + ------------------------------------------------------------------- Sat Jan 16 16:25:26 UTC 2021 - Fabian Vogt diff --git a/libqt5-qtscxml.spec b/libqt5-qtscxml.spec index ce1c079..83aca39 100644 --- a/libqt5-qtscxml.spec +++ b/libqt5-qtscxml.spec @@ -19,25 +19,27 @@ # Internal QML imports of examples %global __requires_exclude qmlimport\\((CalculatorStateMachine|Directions|MediaPlayerDataModel|MediaPlayerStateMachine|TrafficLightStateMachine).* -%define qt5_snapshot 0 +%define qt5_snapshot 1 %define libname libQt5Scxml5 %define base_name libqt5 %define real_version 5.15.2 %define so_version 5.15.2 -%define tar_version qtscxml-everywhere-src-5.15.2 +%define tar_version qtscxml-everywhere-src-%{version} Name: libqt5-qtscxml -Version: 5.15.2 +Version: 5.15.2+kde1 Release: 0 Summary: Qt 5 State Chart XML Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) Group: System/Libraries URL: https://qt.io -Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz +Source: %{tar_version}.tar.xz Source1: baselibs.conf -BuildRequires: libQt5Core-private-headers-devel >= %{version} -BuildRequires: libqt5-qtbase-devel >= %{version} -BuildRequires: libqt5-qtdeclarative-devel >= %{version} -BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} +# PATCH-FIX-OPENSUSE +Patch1: 0001-Revert-Bump-version.patch +BuildRequires: libQt5Core-private-headers-devel >= %{real_version} +BuildRequires: libqt5-qtbase-devel >= %{real_version} +BuildRequires: libqt5-qtdeclarative-devel >= %{real_version} +BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{real_version} BuildRequires: xz %if %{qt5_snapshot} #to create the forwarding headers @@ -108,7 +110,7 @@ Summary: Non-ABI stable experimental API for Qt5's State Chart XML librar License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} -Requires: libQt5Core-private-headers-devel >= %{version} +Requires: libQt5Core-private-headers-devel >= %{real_version} BuildArch: noarch %description private-headers-devel diff --git a/qtscxml-everywhere-src-5.15.2+kde1.obscpio b/qtscxml-everywhere-src-5.15.2+kde1.obscpio new file mode 100644 index 0000000..40c8597 --- /dev/null +++ b/qtscxml-everywhere-src-5.15.2+kde1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49931abf97c83b5bbd0a75fe9c110753690b508170d9002b166b21974f9bd2d0 +size 2483213 diff --git a/qtscxml-everywhere-src-5.15.2.tar.xz b/qtscxml-everywhere-src-5.15.2.tar.xz deleted file mode 100644 index a6d03f1..0000000 --- a/qtscxml-everywhere-src-5.15.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc -size 434204 diff --git a/qtscxml-everywhere-src.obsinfo b/qtscxml-everywhere-src.obsinfo new file mode 100644 index 0000000..c96c474 --- /dev/null +++ b/qtscxml-everywhere-src.obsinfo @@ -0,0 +1,5 @@ +name: qtscxml-everywhere-src +version: 5.15.2+kde1 +mtime: 1603777786 +commit: 7a15000f42c7a3171719727cd056f82a78244ed7 +