From c93909460d82b28d493cdfb180bbd693b81f3f7c Mon Sep 17 00:00:00 2001
From: Matthieu Saulnier <fantom@fedoraproject.org>
Date: Fri, 10 Jan 2025 20:59:54 +0100
Subject: [PATCH] Update to 2.22
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fixes: rhbz#2020936

Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
---
 .gitignore                   |  1 +
 pycparser-unbundle-ply.patch | 20 ++++++++++----------
 python-pycparser.spec        |  6 +++---
 sources                      |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3b31a6b..fd4950b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /release_v2.14.tar.gz
 /release_v2.19.tar.gz
 /release_v2.20.tar.gz
+/release_v2.22.tar.gz
diff --git a/pycparser-unbundle-ply.patch b/pycparser-unbundle-ply.patch
index 0f0cd6b..5abbf72 100644
--- a/pycparser-unbundle-ply.patch
+++ b/pycparser-unbundle-ply.patch
@@ -1,10 +1,10 @@
 diff --git a/pycparser/c_lexer.py b/pycparser/c_lexer.py
-index 045d24e..9b3cbf2 100644
+index 22c64bc..a97c5d1 100644
 --- a/pycparser/c_lexer.py
 +++ b/pycparser/c_lexer.py
-@@ -9,8 +9,8 @@
+@@ -8,8 +8,8 @@
+ #------------------------------------------------------------------------------
  import re
- import sys
  
 -from .ply import lex
 -from .ply.lex import TOKEN
@@ -14,20 +14,20 @@ index 045d24e..9b3cbf2 100644
  
  class CLexer(object):
 diff --git a/pycparser/c_parser.py b/pycparser/c_parser.py
-index 744ede8..50156a3 100644
+index d31574a..5fc3544 100644
 --- a/pycparser/c_parser.py
 +++ b/pycparser/c_parser.py
-@@ -8,7 +8,7 @@
+@@ -6,7 +6,7 @@
+ # Eli Bendersky [https://eli.thegreenplace.net/]
+ # License: BSD
  #------------------------------------------------------------------------------
- import re
- 
 -from .ply import yacc
 +from ply import yacc
  
  from . import c_ast
  from .c_lexer import CLexer
 diff --git a/setup.py b/setup.py
-index 6dce89c..b3dbfb4 100644
+index f7e89bf..f78f559 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -8,6 +8,8 @@ except ImportError:
@@ -40,9 +40,9 @@ index 6dce89c..b3dbfb4 100644
  def _run_build_tables(dir):
      from subprocess import check_call
 @@ -60,7 +62,8 @@ setup(
-         'Programming Language :: Python :: 3.6',
+         'Programming Language :: Python :: 3.12',
      ],
-     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+     python_requires=">=3.8",
 -    packages=['pycparser', 'pycparser.ply'],
 +    packages=['pycparser'],
 +    install_requires=['ply==' + ply.__version__],
diff --git a/python-pycparser.spec b/python-pycparser.spec
index a929c7e..aa370d5 100644
--- a/python-pycparser.spec
+++ b/python-pycparser.spec
@@ -2,7 +2,7 @@
 
 Name:           python-pycparser
 Summary:        C parser and AST generator written in Python
-Version:        2.20
+Version:        2.22
 Release:        %autorelease
 License:        BSD-3-Clause
 URL:            http://github.com/eliben/pycparser
@@ -23,7 +23,7 @@ BuildRequires:  python3-ply
 
 # for unit tests
 %if %{with tests}
-BuildRequires:  cpp
+BuildRequires:  gcc
 %endif
 
 %description
@@ -64,7 +64,7 @@ popd
 %check
 %pyproject_check_import
 %if %{with tests}
-%{python3} tests/all_tests.py
+%py3_test_envvars %{python3} -m unittest discover
 %endif
  
 %files -n python3-pycparser -f %{pyproject_files}
diff --git a/sources b/sources
index 4789666..14d685c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (release_v2.20.tar.gz) = d2dc48727750ec0a80d5e3b0c9fba390c3647416a3e18cad59429edb9f55d043c7695c52301b037c93af5d96ffc85fcba7cd54d376abdb89e973759c59fa189d
+SHA512 (release_v2.22.tar.gz) = 1c5be2b83c0a892cafa55a2595942d7048994772dc0fc71d2943004b4198d939c0bf2a164d763d94fe11d532e49371c59c1cf4037c32dab8d3cf0c553a8de64a