Accepting request 985477 from KDE:Qt:5.15

Qt 5.15.5 with patch collection + qtscript 5.15.10 (forwarded request 985459 from favogt)

OBS-URL: https://build.opensuse.org/request/show/985477
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtgraphicaleffects?expand=0&rev=41

0001-Revert-Bump-version.patch

@@ -1,23 +0,0 @@
-From bcb019d9d878e9f82b804f1005bb1f3070d3e85c Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Tue, 22 Jun 2021 21:38:53 +0200
-Subject: [PATCH] Revert "Bump version"
-
-This reverts commit 997858cb7b68d138c999fa1eeebe2a38a9d88547.
----
- .qmake.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.qmake.conf b/.qmake.conf
-index 5fb75cf..1dc5dd1 100644
---- a/.qmake.conf
-+++ b/.qmake.conf
-@@ -2,4 +2,4 @@ load(qt_build_config)
- 
- 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
-

_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/qtgraphicaleffects.git</param>
    <param name="scm">git</param>
    <param name="filename">qtgraphicaleffects-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"/>

libqt5-qtgraphicaleffects.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jun 27 13:09:26 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+  * Revert "Update commercial license headers"
+  * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
 -------------------------------------------------------------------
 Tue Jun 22 19:38:54 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
 

libqt5-qtgraphicaleffects.spec

@@ -18,11 +18,11 @@
 
 %define qt5_snapshot 1
 %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 qtgraphicaleffects-everywhere-src-%{version}
 Name:           libqt5-qtgraphicaleffects
-Version:        5.15.2+kde2
+Version:        5.15.5+kde0
 Release:        0
 Summary:        Qt 5 Graphical Effects
 # Legal: the 'tools' folder is not built.
@@ -30,8 +30,6 @@ 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:         %{tar_version}.tar.xz
-# PATCH-FIX-OPENSUSE
-Patch1:         0001-Revert-Bump-version.patch
 BuildRequires:  libqt5-qtdeclarative-devel >= %{real_version}
 BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= %{real_version}
 BuildRequires:  xz

qtgraphicaleffects-everywhere-src-5.15.2+kde2.obscpio

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

qtgraphicaleffects-everywhere-src-5.15.5+kde0.obscpio

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

qtgraphicaleffects-everywhere-src.obsinfo

@@ -1,5 +1,4 @@
 name: qtgraphicaleffects-everywhere-src
-version: 5.15.2+kde2
-mtime: 1604573028
-commit: c36998dc1581167b12cc3de8e4ac68c2a5d9f76e
-
+version: 5.15.5+kde0
+mtime: 1652714200
+commit: c25898224cd957491d10dbe48f2f0be66f2955de