Accepting request 902343 from KDE:Qt:5.15
Qt 5.15.2 + KDE patch collection OBS-URL: https://build.opensuse.org/request/show/902343 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtx11extras?expand=0&rev=42
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
1dca58be99
23
0001-Revert-Bump-version.patch
Normal file
23
0001-Revert-Bump-version.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From 0985045bae063d07ce21438632430f55e2090b1a Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Tue, 22 Jun 2021 21:35:07 +0200
|
||||
Subject: [PATCH] Revert "Bump version"
|
||||
|
||||
This reverts commit 3898f5484fd4864b047729bfeda9a1222f32364f.
|
||||
---
|
||||
.qmake.conf | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/.qmake.conf b/.qmake.conf
|
||||
index bbf484f..ba84e23 100644
|
||||
--- a/.qmake.conf
|
||||
+++ b/.qmake.conf
|
||||
@@ -3,4 +3,4 @@ load(qt_build_config)
|
||||
CONFIG += warning_clean
|
||||
DEFINES += QT_NO_FOREACH
|
||||
|
||||
-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/qtx11extras.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">qtx11extras-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/qtx11extras.git</param>
|
||||
<param name="changesrevision">3898f5484fd4864b047729bfeda9a1222f32364f</param></service></servicedata>
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 22 19:35:07 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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 20 12:10:11 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
||||
@ -16,24 +16,26 @@
|
||||
#
|
||||
|
||||
|
||||
%define qt5_snapshot 0
|
||||
%define qt5_snapshot 1
|
||||
%define libname libQt5X11Extras5
|
||||
%define base_name libqt5
|
||||
%define real_version 5.15.2
|
||||
%define so_version 5.15.2
|
||||
%define tar_version qtx11extras-everywhere-src-5.15.2
|
||||
%define tar_version qtx11extras-everywhere-src-%{version}
|
||||
Name: libqt5-qtx11extras
|
||||
Version: 5.15.2
|
||||
Version: 5.15.2+kde1
|
||||
Release: 0
|
||||
Summary: Qt 5 X11 Extras Addon
|
||||
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: libQt5Gui-private-headers-devel >= %{version}
|
||||
BuildRequires: libQt5PlatformHeaders-devel >= %{version}
|
||||
BuildRequires: libQt5Gui-private-headers-devel >= %{real_version}
|
||||
BuildRequires: libQt5PlatformHeaders-devel >= %{real_version}
|
||||
BuildRequires: xz
|
||||
%if %{qt5_snapshot}
|
||||
#to create the forwarding headers
|
||||
@ -47,7 +49,7 @@ deployed across several other desktop and embedded operating systems
|
||||
without having to rewrite the source code.)
|
||||
|
||||
%prep
|
||||
%setup -q -n %{tar_version}
|
||||
%autosetup -p1 -n %{tar_version}
|
||||
|
||||
%package -n %{libname}
|
||||
Summary: Qt 5 X11 Extras Addon
|
||||
|
||||
3
qtx11extras-everywhere-src-5.15.2+kde1.obscpio
Normal file
3
qtx11extras-everywhere-src-5.15.2+kde1.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9fedc6ea13f6f0b6964bf973849da4f8d615a44734d10b0e8a2f849e50627875
|
||||
size 3097101
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e
|
||||
size 143972
|
||||
5
qtx11extras-everywhere-src.obsinfo
Normal file
5
qtx11extras-everywhere-src.obsinfo
Normal file
@ -0,0 +1,5 @@
|
||||
name: qtx11extras-everywhere-src
|
||||
version: 5.15.2+kde1
|
||||
mtime: 1603777751
|
||||
commit: 3898f5484fd4864b047729bfeda9a1222f32364f
|
||||
|
||||
Loading…
Reference in New Issue
Block a user