Accepting request 902334 from KDE:Qt:5.15

Qt 5.15.2 + KDE patch collection

OBS-URL: https://build.opensuse.org/request/show/902334
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtsensors?expand=0&rev=46
This commit is contained in:
Dominique Leuenberger 2021-06-27 16:58:52 +00:00 committed by Git OBS Bridge
commit 35287ce1ba
8 changed files with 75 additions and 14 deletions

View File

@ -0,0 +1,22 @@
From 476b51c9b54f94fa872be4f3502899fee8a9b18e Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
Date: Tue, 22 Jun 2021 21:34:02 +0200
Subject: [PATCH] Revert "Bump version"
This reverts commit 71289d499bf8f5122b7a2228d9672c85abc89aec.
---
.qmake.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.qmake.conf b/.qmake.conf
index 2b92eda..b16fbc3 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.2
--
2.20.1

18
_service Normal file
View 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/qtsensors.git</param>
<param name="scm">git</param>
<param name="filename">qtsensors-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
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://invent.kde.org/qt/qt/qtsensors.git</param>
<param name="changesrevision">921a31375f29e429e95352b08b2b9dbfea663cb1</param></service></servicedata>

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Jun 22 19:34:02 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- 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:33 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -19,29 +19,31 @@
# Internal QML imports of examples
%global __requires_exclude qmlimport\\((Explorer|Grue).*
%define qt5_snapshot 0
%define qt5_snapshot 1
%define libname libQt5Sensors5
%define base_name libqt5
%define real_version 5.15.2
%define so_version 5.15.2
%define tar_version qtsensors-everywhere-src-5.15.2
%define tar_version qtsensors-everywhere-src-%{version}
Name: libqt5-qtsensors
Version: 5.15.2
Version: 5.15.2+kde2
Release: 0
Summary: Qt 5 Sensors library
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.15/%{real_version}/submodules/%{tar_version}.tar.xz
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-OPENSUSE
Patch1: 0001-Revert-Bump-version.patch
BuildRequires: fdupes
BuildRequires: libQt5Core-private-headers-devel >= %{version}
BuildRequires: libQt5Core-private-headers-devel >= %{real_version}
BuildRequires: pkgconfig
BuildRequires: xz
BuildRequires: pkgconfig(Qt5Core) >= %{version}
BuildRequires: pkgconfig(Qt5DBus) >= %{version}
BuildRequires: pkgconfig(Qt5Qml) >= %{version}
BuildRequires: pkgconfig(Qt5Quick) >= %{version}
BuildRequires: pkgconfig(Qt5Core) >= %{real_version}
BuildRequires: pkgconfig(Qt5DBus) >= %{real_version}
BuildRequires: pkgconfig(Qt5Qml) >= %{real_version}
BuildRequires: pkgconfig(Qt5Quick) >= %{real_version}
%if %{qt5_snapshot}
#to create the forwarding headers
BuildRequires: perl
@ -53,7 +55,7 @@ interfaces. The Qt Sensors API also provides a motion gesture
recognition API for devices.
%prep
%setup -q -n %{tar_version}
%autosetup -p1 -n %{tar_version}
%package -n %{libname}
Summary: Qt 5 Sensors library
@ -101,7 +103,7 @@ Summary: Non-ABI stable experimental API for the Qt5 Sensors library
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}
Provides: libQt5Sensors-private-headers-devel = %{version}
Obsoletes: libQt5Sensors-private-headers-devel < %{version}
BuildArch: noarch

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71cef5fbb6e4525cd17cf61cea6dfa9af75dbee7a04de85dba6baa31e571cf8d
size 7505934

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839
size 2056944

View File

@ -0,0 +1,5 @@
name: qtsensors-everywhere-src
version: 5.15.2+kde2
mtime: 1603886021
commit: 921a31375f29e429e95352b08b2b9dbfea663cb1