From fbd8d880e20932a5847c5c07bcec49bbcd86991461ce9ffccfbeb5fa9cf49ee3 Mon Sep 17 00:00:00 2001
From: Benjamin Greiner <code@bnavigator.de>
Date: Mon, 30 Jan 2023 19:16:45 +0000
Subject: [PATCH] Accepting request 1061915 from
 home:bnavigator:branches:KDE:Qt:PyQt

- Update to 1.14.1
  * Support different patch versions for Qt v5.15.
- Drop pyqt-builder-add-timeline5.15.patch

OBS-URL: https://build.opensuse.org/request/show/1061915
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-pyqt-builder?expand=0&rev=15
---
 PyQt-builder-1.14.0.tar.gz          |  3 ---
 PyQt-builder-1.14.1.tar.gz          |  3 +++
 pyqt-builder-add-timeline5.15.patch | 14 --------------
 python-pyqt-builder.changes         |  7 +++++++
 python-pyqt-builder.spec            |  4 +---
 5 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 PyQt-builder-1.14.0.tar.gz
 create mode 100644 PyQt-builder-1.14.1.tar.gz
 delete mode 100644 pyqt-builder-add-timeline5.15.patch

diff --git a/PyQt-builder-1.14.0.tar.gz b/PyQt-builder-1.14.0.tar.gz
deleted file mode 100644
index d7c0f77..0000000
--- a/PyQt-builder-1.14.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6755931c6d2f8940553e0334d10c933ce5cc18b64425e94fda1accf4ff774f59
-size 3907829
diff --git a/PyQt-builder-1.14.1.tar.gz b/PyQt-builder-1.14.1.tar.gz
new file mode 100644
index 0000000..6442f8d
--- /dev/null
+++ b/PyQt-builder-1.14.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83bc3e300aff8b41405804b6a9c2913389ab59c48ad9f0cb8584a6ef73bca502
+size 3907982
diff --git a/pyqt-builder-add-timeline5.15.patch b/pyqt-builder-add-timeline5.15.patch
deleted file mode 100644
index 61e1c61..0000000
--- a/pyqt-builder-add-timeline5.15.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: PyQt-builder-1.14.0/pyqtbuild/builder.py
-===================================================================
---- PyQt-builder-1.14.0.orig/pyqtbuild/builder.py
-+++ PyQt-builder-1.14.0/pyqtbuild/builder.py
-@@ -530,7 +530,8 @@ macx {
-         patch = self.qt_version & 0xff
- 
-         # Qt v5.12.4 was the last release where we updated for a patch version.
--        if (major, minor) >= (5, 13):
-+        # And SUSE started to use it in 5.15.8 again for qt3d-qt5
-+        if (major, minor) >= (5, 13) and (major, minor, patch) < (5, 15, 8):
-             patch = 0
-         elif (major, minor) == (5, 12):
-             if patch > 4:
diff --git a/python-pyqt-builder.changes b/python-pyqt-builder.changes
index da0a575..c75f1a5 100644
--- a/python-pyqt-builder.changes
+++ b/python-pyqt-builder.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 24 18:51:01 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Update to 1.14.1
+  * Support different patch versions for Qt v5.15.
+- Drop pyqt-builder-add-timeline5.15.patch
+
 -------------------------------------------------------------------
 Thu Jan 12 21:14:30 UTC 2023 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-pyqt-builder.spec b/python-pyqt-builder.spec
index dc5f606..ca52f52 100644
--- a/python-pyqt-builder.spec
+++ b/python-pyqt-builder.spec
@@ -18,7 +18,7 @@
 
 %define mname pyqt-builder
 Name:           python-%{mname}
-Version:        1.14.0
+Version:        1.14.1
 Release:        0
 Summary:        The PEP 517 compliant PyQt build system
 License:        GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP
@@ -26,8 +26,6 @@ URL:            https://www.riverbankcomputing.com/software/pyqt-builder
 Source0:        https://files.pythonhosted.org/packages/source/P/PyQt-builder/PyQt-builder-%{version}.tar.gz
 # PATCH-FEATURE-SUSE support-python3.6.patch alarrosa@suse.com
 Patch0:         support-python3.6.patch
-# PATCH-FEATURE-SUSE pyqt-builder-add-timeline5.15.patch code@bnavigator.de
-Patch1:         pyqt-builder-add-timeline5.15.patch
 BuildRequires:  %{python_module base >= 3.6}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}