From 12207487186d02febf91eb858240bdb67aa9ac8230d191552c3dec79a74cb3e4 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Tue, 28 Jun 2022 08:21:47 +0000
Subject: [PATCH] Qt 5.15.5 with patch collection + qtscript 5.15.10

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtsvg?expand=0&rev=16
---
 0001-Revert-Bump-version.patch            | 23 -----------------------
 _service                                  |  4 ++--
 libqt5-qtsvg.changes                      |  8 ++++++++
 libqt5-qtsvg.spec                         |  8 +++-----
 qtsvg-everywhere-src-5.15.2+kde16.obscpio |  3 ---
 qtsvg-everywhere-src-5.15.5+kde10.obscpio |  3 +++
 qtsvg-everywhere-src.obsinfo              |  6 +++---
 7 files changed, 19 insertions(+), 36 deletions(-)
 delete mode 100644 0001-Revert-Bump-version.patch
 delete mode 100644 qtsvg-everywhere-src-5.15.2+kde16.obscpio
 create mode 100644 qtsvg-everywhere-src-5.15.5+kde10.obscpio

diff --git a/0001-Revert-Bump-version.patch b/0001-Revert-Bump-version.patch
deleted file mode 100644
index d11d612..0000000
--- a/0001-Revert-Bump-version.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8c975330fa1062151bd1a7bce802d70ada3d9038 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Mon, 21 Jun 2021 18:22:56 +0200
-Subject: [PATCH] Revert "Bump version"
-
-This reverts commit 9aac88424a1b76e0198b52437af58a6d94aff8e9.
----
- .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
-
diff --git a/_service b/_service
index 14f1d93..e22c994 100644
--- a/_service
+++ b/_service
@@ -1,12 +1,12 @@
 <services>
   <service name="obs_scm" mode="disabled">
    <param name="changesgenerate">enable</param>
-   <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+   <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
    <param name="url">https://invent.kde.org/qt/qt/qtsvg.git</param>
    <param name="scm">git</param>
    <param name="filename">qtsvg-everywhere-src</param>
    <param name="revision">kde/5.15</param>
-   <param name="parent-tag">v5.15.2</param>
+   <param name="parent-tag">v5.15.5-lts-lgpl</param>
    <param name="changesgenerate">enable</param>
   </service>
   <service name="set_version" mode="disabled"/>
diff --git a/libqt5-qtsvg.changes b/libqt5-qtsvg.changes
index 3b4b306..c391c0c 100644
--- a/libqt5-qtsvg.changes
+++ b/libqt5-qtsvg.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jun 27 13:07:25 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.5+kde10, rebased upstream:
+  * Revert "Update commercial license headers"
+  * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
 -------------------------------------------------------------------
 Fri Jan 21 08:14:20 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/libqt5-qtsvg.spec b/libqt5-qtsvg.spec
index 9b0d329..5568e24 100644
--- a/libqt5-qtsvg.spec
+++ b/libqt5-qtsvg.spec
@@ -19,11 +19,11 @@
 %define qt5_snapshot 1
 %define libname libQt5Svg5
 %define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
 %define tar_version qtsvg-everywhere-src-%{version}
 Name:           libqt5-qtsvg
-Version:        5.15.2+kde16
+Version:        5.15.5+kde10
 Release:        0
 Summary:        Qt 5 SVG Library
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
@@ -31,8 +31,6 @@ Group:          Development/Libraries/X11
 URL:            https://www.qt.io
 Source:         %{tar_version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-OPENSUSE
-Patch1:         0001-Revert-Bump-version.patch
 BuildRequires:  libQt5Core-private-headers-devel >= %{real_version}
 BuildRequires:  libQt5Gui-private-headers-devel >= %{real_version}
 BuildRequires:  libQt5Widgets-private-headers-devel >= %{real_version}
diff --git a/qtsvg-everywhere-src-5.15.2+kde16.obscpio b/qtsvg-everywhere-src-5.15.2+kde16.obscpio
deleted file mode 100644
index 344456f..0000000
--- a/qtsvg-everywhere-src-5.15.2+kde16.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de0192de11104af3bf488f4ace20c13821cb042c56c7332deb0047f9e083f4dd
-size 14300173
diff --git a/qtsvg-everywhere-src-5.15.5+kde10.obscpio b/qtsvg-everywhere-src-5.15.5+kde10.obscpio
new file mode 100644
index 0000000..11c56fb
--- /dev/null
+++ b/qtsvg-everywhere-src-5.15.5+kde10.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:18f27d38217767ee8d2b9474d9de93608ad2a83191725e1276f763196e2d3aed
+size 14300173
diff --git a/qtsvg-everywhere-src.obsinfo b/qtsvg-everywhere-src.obsinfo
index 5b696e6..5be6a80 100644
--- a/qtsvg-everywhere-src.obsinfo
+++ b/qtsvg-everywhere-src.obsinfo
@@ -1,4 +1,4 @@
 name: qtsvg-everywhere-src
-version: 5.15.2+kde16
-mtime: 1641571225
-commit: 728012f7762ecd5762d493f8796907c6456f31e7
+version: 5.15.5+kde10
+mtime: 1655461562
+commit: 68de925ddc20dfb8900be4fa47fa5a5916836cc8