Accepting request 902531 from KDE:Qt:5.15
- Fix requirement in baselibs.conf - 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 OBS-URL: https://build.opensuse.org/request/show/902531 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtscxml?expand=0&rev=19
This commit is contained in:
commit
0d3062c66b
23
0001-Revert-Bump-version.patch
Normal file
23
0001-Revert-Bump-version.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From fe880ac83d870e1dfdafb6a472ff43529187e759 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
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
|
||||
|
18
_service
Normal file
18
_service
Normal file
@ -0,0 +1,18 @@
|
||||
<services>
|
||||
<service name="obs_scm" mode="disabled">
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
|
||||
<param name="url">https://invent.kde.org/qt/qt/qtscxml.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">qtscxml-everywhere-src</param>
|
||||
<param name="revision">kde/5.15</param>
|
||||
<param name="parent-tag">v5.15.2</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled"/>
|
||||
<service name="tar" mode="buildtime"/>
|
||||
<service name="recompress" mode="buildtime">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
</services>
|
4
_servicedata
Normal file
4
_servicedata
Normal file
@ -0,0 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://invent.kde.org/qt/qt/qtscxml.git</param>
|
||||
<param name="changesrevision">7a15000f42c7a3171719727cd056f82a78244ed7</param></service></servicedata>
|
@ -1,3 +1,3 @@
|
||||
libQt5Scxml5
|
||||
libqt5-qtscxml-devel
|
||||
requires "libQt5Core5-<targettype> = <version>"
|
||||
requires "libQt5Scxml5-<targettype> = <version>"
|
||||
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 26 13:36:04 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Fix requirement in baselibs.conf
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 22 19:35:02 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- 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 <fabian@ritter-vogt.de>
|
||||
|
||||
|
@ -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
|
||||
|
3
qtscxml-everywhere-src-5.15.2+kde1.obscpio
Normal file
3
qtscxml-everywhere-src-5.15.2+kde1.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:49931abf97c83b5bbd0a75fe9c110753690b508170d9002b166b21974f9bd2d0
|
||||
size 2483213
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc
|
||||
size 434204
|
5
qtscxml-everywhere-src.obsinfo
Normal file
5
qtscxml-everywhere-src.obsinfo
Normal file
@ -0,0 +1,5 @@
|
||||
name: qtscxml-everywhere-src
|
||||
version: 5.15.2+kde1
|
||||
mtime: 1603777786
|
||||
commit: 7a15000f42c7a3171719727cd056f82a78244ed7
|
||||
|
Loading…
x
Reference in New Issue
Block a user