Fixed the handling of exceptions that sub-class C++ exceptions (include missing SPEC file changes)

Resolves: bz#2225259

.gitignore

@@ -1 +1,2 @@
 /sip-6.5.1.tar.gz
+/sip-6.6.2.tar.gz

.sip6.metadata

@@ -0,0 +1 @@
+f0e7edb9b96cfd4f5ae00ee82c42a6a36eaeb932 sip-6.6.2.tar.gz

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)
+

sip6-fix-exception-handling.patch

@@ -0,0 +1,12 @@
+diff --git a/sipbuild/generator/parser/rules.py b/sipbuild/generator/parser/rules.py
+index c221ad7..e79e1b8 100644
+--- a/sipbuild/generator/parser/rules.py
++++ b/sipbuild/generator/parser/rules.py
+@@ -2293,6 +2293,7 @@ def p_opt_base_exception(p):
+ 
+     if len(p) == 4:
+         base = p[2]
++        base.make_absolute()
+ 
+         # See if it is a project-defined exception.
+         for xd in p.parser.pm.spec.exceptions:

sip6.spec

@@ -1,8 +1,8 @@
 %global pypi_name sip
 
 Name:           sip6
-Version:        6.5.1
-Release:        1%{?dist}
+Version:        6.6.2
+Release:        2%{?dist}
 Summary:        SIP - Python/C++ Bindings Generator
 %py_provides    python3-sip6
 
@@ -10,10 +10,14 @@ 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
+
+# Bug 2225259 - regression bug when using sub-classed C++ exceptions
+Patch1:         sip6-fix-exception-handling.patch
 
 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 +49,14 @@ Python bindings for wxWidgets.}
 %{python3_sitearch}/sipbuild/
 
 %changelog
+* Tue Jul 25 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.2-2
+- Fixed the handling of exceptions that sub-class C++ exceptions
+  Resolves: bz#2225259
+
+* 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

sources

@@ -1 +1 @@
-SHA512 (sip-6.5.1.tar.gz) = 2d6f225e653873462d97dfdc85bd308a26b66996e1bb98e2c3aa60a3b260db745021f1d3182db8e943fd216ee27a2f65731b96d287e94f8f2e7972c5df971c69
+SHA512 (sip-6.6.2.tar.gz) = 5e031baa9ff6d8d19f4c36ef7c3900c6440d261102259cdc12fce28471a849fed80c123bf31ad506b099a925b2967eb5863e6736ac00fbcff99198711cf0e5e5