.gitignore

@@ -1 +1 @@
-SOURCES/sip-6.6.2.tar.gz
+SOURCES/sip-6.9.0.tar.gz

.sip6.metadata

@@ -1 +1 @@
-f0e7edb9b96cfd4f5ae00ee82c42a6a36eaeb932 SOURCES/sip-6.6.2.tar.gz
+fa840eaf6a5490137801d9385c79faf17ffecbed SOURCES/sip-6.9.0.tar.gz

SOURCES/323d39a2d602

@@ -1,22 +0,0 @@
-
-# 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)
-

SOURCES/sip6-fix-exception-handling.patch

@@ -1,12 +0,0 @@
-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:

SPECS/sip6.spec

@@ -1,23 +1,21 @@
 %global pypi_name sip
 
 Name:           sip6
-Version:        6.6.2
+Version:        6.9.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        SIP - Python/C++ Bindings Generator
 %py_provides    python3-sip6
 
-# code_generator/parser.{c.h} is GPLv2+ with exceptions (bison)
+License:        BSD-2-Clause
-License:        (GPLv2 or GPLv3) and (GPLv2+ with exceptions)
+URL:            https://github.com/Python-SIP/sip
-URL:            https://www.riverbankcomputing.com/software/sip
+Source0:        %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
-Source0:        %{pypi_source}
-Patch0:         323d39a2d602
 
-# Bug 2225259 - regression bug when using sub-classed C++ exceptions
+BuildArch:      noarch
-Patch1:         sip6-fix-exception-handling.patch
 
-BuildRequires:  gcc
 BuildRequires:  python3-devel
-BuildRequires:  %{py3_dist packaging ply setuptools toml}
+
+# For tests
+BuildRequires:  gcc-c++
 
 %global _description %{expand:
 SIP is a collection of tools that makes it very easy to create Python bindings
@@ -31,32 +29,114 @@ Python bindings for wxWidgets.}
 %prep
 %autosetup -n %{pypi_name}-%{version} -p 1
 
+%generate_buildrequires
+export SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
+%pyproject_buildrequires
+
 %build
-%py3_build
+export SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
 
 %check
-%py3_check_import sipbuild sipbuild.distinfo sipbuild.module sipbuild.tools
+#{py3_test_envvars} {python3} -m unittest discover -v -s test
-
 
 %files
-%doc README
+%doc README.md
-%license LICENSE LICENSE-GPL2 LICENSE-GPL3
+%license LICENSE
 %{_bindir}/sip*
-%{python3_sitearch}/sip-*
+%{python3_sitelib}/sip-*
-%{python3_sitearch}/sipbuild/
+%{python3_sitelib}/sipbuild/
 
 %changelog
-* Tue Jul 25 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.2-2
+* Mon Dec 09 2024 Jan Grulich <jgrulich@redhat.com> - 6.9.0-1
-- Fixed the handling of exceptions that sub-class C++ exceptions
+- 6.9.0
-  Resolves: bz#2225259
+  Resolves: RHEL-70413
+
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 6.8.2-4
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 6.8.2-3
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.8.2-3
+- Bump release for June 2024 mass rebuild
+
+* Mon Feb 12 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.2-2
+- Rebuild (fixed SPDX license)
+
+* Thu Jan 25 2024 Scott Talbert <swt@techie.net> - 6.8.2-1
+- Update to new upstream release 6.8.2 (#2252260)
+
+* Mon Oct 16 2023 Jan Grulich <jgrulich@redhat.com> - 6.7.12-1
+- 6.7.12
+
+* Wed Aug 02 2023 Scott Talbert <swt@techie.net> - 6.7.11-1
+- Update to new upstream release 6.7.11 (#2225117)
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.7.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 6.7.9-2
+- Rebuilt for Python 3.12
+
+* Wed Apr 26 2023 Scott Talbert <swt@techie.net> - 6.7.9-1
+- Update to new upstream release 6.7.9 (#2185559)
+
+* Tue Feb 07 2023 Scott Talbert <swt@techie.net> - 6.7.7-1
+- Update to new upstream release 6.7.7 (#2167385)
+
+* Tue Jan 31 2023 Scott Talbert <swt@techie.net> - 6.7.6-1
+- Update to new upstream release 6.7.6 (#2165207)
+- Modernize python packaging
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.7.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Dec 02 2022 Scott Talbert <swt@techie.net> - 6.7.5-1
+- Update to new upstream release 6.7.5 (#2131647)
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jul 19 2022 Scott Talbert <swt@techie.net> - 6.6.2-1
+- Update to new upstream release 6.6.2 (#2074712)
+
+* Wed Jun 15 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 6.5.1-3
+- Add patch for Python 3.11 compatibility
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 6.5.1-2
+- Rebuilt for Python 3.11
+
+* Fri Feb 18 2022 Scott Talbert <swt@techie.net> - 6.5.1-1
+- Update to new upstream release 6.5.1 (#2049172)
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Dec 14 2021 Scott Talbert <swt@techie.net> - 6.5.0-1
+- Update to new upstream release 6.5.0 (#2028405)
+
+* Sat Oct 30 2021 Scott Talbert <swt@techie.net> - 6.4.0-1
+- Update to new upstream release 6.4.0 (#2018175)
+
+* Wed Oct 13 2021 Scott Talbert <swt@techie.net> - 6.3.1-1
+- Update to new upstream release 6.3.1 (#2013781)
+
+* Tue Oct 12 2021 Scott Talbert <swt@techie.net> - 6.3.0-1
+- Update to new upstream release 6.3.0 (#2013274)
+
+* 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
 
-* Mon Oct 24 2022 Jan Grulich <jgrulich@redhat.com> - 6.6.2-1
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.1-2
-- 6.6.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-  Resolves: bz#2118862
 
-* Tue Apr 19 2022 Jan Grulich <jgrulich@redhat.com> - 6.5.1-1
+* Thu Jul 08 2021 Scott Talbert <swt@techie.net> - 6.1.1-1
-- Initial package
+- Initial package.
-  Resolves: bz#2071748