From 62c0d11a39a1db055d1fd86a5265c1628a090a2c Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Oct 04 2021 23:36:32 +0000
Subject: Update to new upstream release 6.2.0 (#2010059)


---

diff --git a/.gitignore b/.gitignore
index 5a04b17..7658f40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sip-6.1.1.tar.gz
+/sip-6.2.0.tar.gz
diff --git a/64d8a5d785e1.patch b/64d8a5d785e1.patch
deleted file mode 100644
index 1e8df46..0000000
--- a/64d8a5d785e1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Phil Thompson <phil@riverbankcomputing.com>
-# Date 1628096545 -3600
-# Node ID 64d8a5d785e187ca2d78a0f555a7c02a6eba23bc
-# Parent  b9f1ac6505a25ec2d4a04c0aa71ad2fc9a7c3c96
-Fixed a regression in the handling of Unicode docstrings.
-
-diff -r b9f1ac6505a2 -r 64d8a5d785e1 code_generator/gencode.c
---- a/code_generator/gencode.c	Tue Jul 13 17:57:49 2021 +0100
-+++ b/code_generator/gencode.c	Wed Aug 04 18:02:25 2021 +0100
-@@ -13638,7 +13638,7 @@
-                     if (isprint(c))
-                         fputc(c, fp);
-                     else
--                        fprintf(fp, "\\x%02x", (int)c);
-+                        fprintf(fp, "\\%03o", (unsigned char)c);
- 
-                     break;
-                 }
-
diff --git a/python3.10.patch b/python3.10.patch
deleted file mode 100644
index 8ca3ee5..0000000
--- a/python3.10.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up sip-6.1.1/sipbuild/py_versions.py.py310 sip-6.1.1/sipbuild/py_versions.py
---- sip-6.1.1/sipbuild/py_versions.py.py310	2021-06-09 05:59:54.000000000 -0400
-+++ sip-6.1.1/sipbuild/py_versions.py	2021-07-08 18:39:25.600512154 -0400
-@@ -23,4 +23,4 @@
- 
- # The first and last supported minor versions of Python v3.
- FIRST_SUPPORTED_MINOR = 6
--LAST_SUPPORTED_MINOR = 9
-+LAST_SUPPORTED_MINOR = 10
diff --git a/sip6.spec b/sip6.spec
index 3f57bfd..77df4d8 100644
--- a/sip6.spec
+++ b/sip6.spec
@@ -1,8 +1,8 @@
 %global pypi_name sip
 
 Name:           sip6
-Version:        6.1.1
-Release:        3%{?dist}
+Version:        6.2.0
+Release:        1%{?dist}
 Summary:        SIP - Python/C++ Bindings Generator
 %py_provides    python3-sip6
 # Remove when F34 is EOL
@@ -13,9 +13,6 @@ Obsoletes:      sip5 < 6.0.0
 License:        (GPLv2 or GPLv3) and (GPLv2+ with exceptions)
 URL:            https://www.riverbankcomputing.com/software/sip
 Source0:        %{pypi_source}
-# Enable sip to work on Python 3.10 (already done upstream in next release)
-Patch0:         python3.10.patch
-Patch1:         64d8a5d785e1.patch
 
 BuildRequires:  gcc
 BuildRequires:  python3-devel
@@ -51,6 +48,9 @@ Python bindings for wxWidgets.}
 %{python3_sitearch}/sipbuild/
 
 %changelog
+* Mon Oct 04 2021 Scott Talbert <swt@techie.net> - 6.2.0-1
+- Update to new upstream release 6.2.0 (#2010059)
+
 * Wed Aug 04 2021 Scott Talbert <swt@techie.net> - 6.1.1-3
 - Fix handling of Unicode docstrings
 
diff --git a/sources b/sources
index 35a6864..ccb4e1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sip-6.1.1.tar.gz) = 94e413c3af4dcac9cbd1eef368f4e88c0b3bfe1ad8b97f4a6ec39af1a448fdf1d79f3c845cf8c9b0ed78b04f2a18d176d750a39d13a47f9122e575d034ed88b4
+SHA512 (sip-6.2.0.tar.gz) = 88e4447aaa574a312bdfbb6ef78fdb95824f33d79988cdf5c824952b7f3535973eed6d8eece7b8c9ce8b442aaa2235e252d438f2316d13272a35c484dd4fda42