From b0dc714ca1a2c541846d228aa8cac5427e89db73 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 28 Mar 2023 12:07:44 +0000
Subject: [PATCH] import sip6-6.6.2-1.el9

---
 .gitignore           |  2 +-
 .sip6.metadata       |  2 +-
 SOURCES/323d39a2d602 | 22 ++++++++++++++++++++++
 SPECS/sip6.spec      |  9 +++++++--
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 SOURCES/323d39a2d602

diff --git a/.gitignore b/.gitignore
index c801f15..8e560f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/sip-6.5.1.tar.gz
+SOURCES/sip-6.6.2.tar.gz
diff --git a/.sip6.metadata b/.sip6.metadata
index 52351b1..94bbe3a 100644
--- a/.sip6.metadata
+++ b/.sip6.metadata
@@ -1 +1 @@
-543f8c906d8c2a918fceef116aa17747a793e5cc SOURCES/sip-6.5.1.tar.gz
+f0e7edb9b96cfd4f5ae00ee82c42a6a36eaeb932 SOURCES/sip-6.6.2.tar.gz
diff --git a/SOURCES/323d39a2d602 b/SOURCES/323d39a2d602
new file mode 100644
index 0000000..8dac875
--- /dev/null
+++ b/SOURCES/323d39a2d602
@@ -0,0 +1,22 @@
+
+# HG changeset patch
+# User Phil Thompson <phil@riverbankcomputing.com>
+# Date 1658047276 -3600
+# Node ID 323d39a2d6020e224e82f894c694add0621714ee
+# Parent  1430b279a3c90da85f2cadd97ec833deae14f446
+Fixed the instantiation of template values.
+
+diff -r 1430b279a3c9 -r 323d39a2d602 sipbuild/generator/parser/instantiations.py
+--- a/sipbuild/generator/parser/instantiations.py	Sun Jun 26 10:01:41 2022 +0100
++++ b/sipbuild/generator/parser/instantiations.py	Sun Jul 17 09:41:16 2022 +0100
+@@ -434,7 +434,8 @@
+         proto_name = proto_value.value.result.definition
+ 
+         if proto_name.is_simple:
+-            i_name = ScopedName.parse(template_string(proto_name, expansions))
++            i_name = ScopedName.parse(
++                    template_string(proto_name.base_name, expansions))
+             i_result = Argument(type=ArgumentType.DEFINED, definition=i_name)
+             i_fcall = FunctionCall(result=i_result,
+                     args=proto_value.value.args)
+
diff --git a/SPECS/sip6.spec b/SPECS/sip6.spec
index 77ae9be..d3a66ad 100644
--- a/SPECS/sip6.spec
+++ b/SPECS/sip6.spec
@@ -1,7 +1,7 @@
 %global pypi_name sip
 
 Name:           sip6
-Version:        6.5.1
+Version:        6.6.2
 Release:        1%{?dist}
 Summary:        SIP - Python/C++ Bindings Generator
 %py_provides    python3-sip6
@@ -10,10 +10,11 @@ Summary:        SIP - Python/C++ Bindings Generator
 License:        (GPLv2 or GPLv3) and (GPLv2+ with exceptions)
 URL:            https://www.riverbankcomputing.com/software/sip
 Source0:        %{pypi_source}
+Patch0:         323d39a2d602
 
 BuildRequires:  gcc
 BuildRequires:  python3-devel
-BuildRequires:  %{py3_dist setuptools toml}
+BuildRequires:  %{py3_dist packaging ply setuptools toml}
 
 %global _description %{expand:
 SIP is a collection of tools that makes it very easy to create Python bindings
@@ -45,6 +46,10 @@ Python bindings for wxWidgets.}
 %{python3_sitearch}/sipbuild/
 
 %changelog
+* Mon Oct 24 2022 Jan Grulich <jgrulich@redhat.com> - 6.6.2-1
+- 6.6.2
+  Resolves: bz#2118862
+
 * Tue Apr 19 2022 Jan Grulich <jgrulich@redhat.com> - 6.5.1-1
 - Initial package
   Resolves: bz#2071748