.gitignore

@@ -1 +1 @@
-SOURCES/release_v2.20.tar.gz
+SOURCES/release_v2.19.tar.gz

.python-pycparser.metadata

@@ -1 +1 @@
-3a7e92b87f9fe0b863ec99b0c4ee9f90a32a3c3f SOURCES/release_v2.20.tar.gz
+141582eb2a5ad9fee9bb7646cecb024f0406be8a SOURCES/release_v2.19.tar.gz

SOURCES/pycparser-2.10-ply.patch

@@ -0,0 +1,38 @@
+diff -up pycparser-release_v2.10/pycparser/c_lexer.py.ply pycparser-release_v2.10/pycparser/c_lexer.py
+--- pycparser-release_v2.10/pycparser/c_lexer.py.ply	2013-08-03 07:15:32.000000000 -0600
++++ pycparser-release_v2.10/pycparser/c_lexer.py	2014-08-20 12:40:48.308461164 -0600
+@@ -9,8 +9,8 @@
+ import re
+ import sys
+ 
+-from .ply import lex
+-from .ply.lex import TOKEN
++from ply import lex
++from ply.lex import TOKEN
+ 
+ 
+ class CLexer(object):
+diff -up pycparser-release_v2.10/pycparser/c_parser.py.ply pycparser-release_v2.10/pycparser/c_parser.py
+--- pycparser-release_v2.10/pycparser/c_parser.py.ply	2013-08-03 07:15:32.000000000 -0600
++++ pycparser-release_v2.10/pycparser/c_parser.py	2014-08-20 12:40:05.154894980 -0600
+@@ -8,7 +8,7 @@
+ #------------------------------------------------------------------------------
+ import re
+ 
+-from .ply import yacc
++from ply import yacc
+ 
+ from . import c_ast
+ from .c_lexer import CLexer
+diff -up pycparser-release_v2.10/setup.py.ply pycparser-release_v2.10/setup.py
+--- pycparser-release_v2.10/setup.py.ply	2013-08-03 07:15:32.000000000 -0600
++++ pycparser-release_v2.10/setup.py	2014-08-20 12:40:05.154894980 -0600
+@@ -22,7 +22,7 @@ setup(
+     classifiers = [
+         'Programming Language :: Python :: 2',
+         'Programming Language :: Python :: 3',],
+-    packages=['pycparser', 'pycparser.ply'],
++    packages=['pycparser'],
+     package_data={'pycparser': ['*.cfg']},
+ )
+ 

SOURCES/pycparser-unbundle-ply.patch

@@ -1,51 +0,0 @@
-diff --git a/pycparser/c_lexer.py b/pycparser/c_lexer.py
-index 045d24e..9b3cbf2 100644
---- a/pycparser/c_lexer.py
-+++ b/pycparser/c_lexer.py
-@@ -9,8 +9,8 @@
- import re
- import sys
- 
--from .ply import lex
--from .ply.lex import TOKEN
-+from ply import lex
-+from ply.lex import TOKEN
- 
- 
- class CLexer(object):
-diff --git a/pycparser/c_parser.py b/pycparser/c_parser.py
-index 744ede8..50156a3 100644
---- a/pycparser/c_parser.py
-+++ b/pycparser/c_parser.py
-@@ -8,7 +8,7 @@
- #------------------------------------------------------------------------------
- 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
---- a/setup.py
-+++ b/setup.py
-@@ -8,6 +8,8 @@ except ImportError:
-     from distutils.command.install import install as _install
-     from distutils.command.sdist import sdist as _sdist
- 
-+import ply
-+
- 
- def _run_build_tables(dir):
-     from subprocess import check_call
-@@ -60,7 +62,8 @@ setup(
-         'Programming Language :: Python :: 3.6',
-     ],
-     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
--    packages=['pycparser', 'pycparser.ply'],
-+    packages=['pycparser'],
-+    install_requires=['ply==' + ply.__version__],
-     package_data={'pycparser': ['*.cfg']},
-     cmdclass={'install': install, 'sdist': sdist},
- )

SPECS/python-pycparser.spec

@@ -1,26 +1,34 @@
+# Ensure that pycparser uses the same YACC __tabversion__ as python-ply
+# package to prevent "yacc table file version is out of date" problem.
+%define ply_version %(LC_ALL=C rpm -q --qf '%%{VERSION}' python%{python3_pkgversion}-ply | grep -Eo '^[^.]+\.[^.]+')
+
 %bcond_without tests
 
 Name:           python-pycparser
 Summary:        C parser and AST generator written in Python
-Version:        2.20
+Version:        2.19
-Release:        6%{?dist}
+Release:        3%{?dist}
 License:        BSD
 URL:            http://github.com/eliben/pycparser
-Source0:        %{url}/archive/release_v%{version}.tar.gz
+Source0:        http://github.com/eliben/pycparser/archive/release_v%{version}.tar.gz
 Source1:        pycparser-0.91.1-remove-relative-sys-path.py
 
+Patch100:       pycparser-2.10-ply.patch
 # This is Fedora-specific; I don't think we should request upstream to
 # remove embedded libraries from their distribuution, when we can remove
 # them during packaging.
-# It also ensures that pycparser uses the same YACC __tabversion__ as ply
-# package to prevent "yacc table file version is out of date" problem.
-Patch100:       pycparser-unbundle-ply.patch
 
 BuildArch:      noarch
+# Exclude i686 arch. Due to a modularity issue it's being added to the
+# x86_64 compose of CRB, but we don't want to ship it at all.
+# See: https://projects.engineering.redhat.com/browse/RCM-72605
+ExcludeArch:    i686
 
-BuildRequires:  python3-devel
+BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python3-setuptools
+BuildRequires:  python%{python3_pkgversion}-setuptools
-BuildRequires:  python3-ply
+BuildRequires:  dos2unix
+BuildRequires:  python%{python3_pkgversion}-ply
+BuildRequires:  python%{python3_pkgversion}-rpm-macros
 
 # for unit tests
 %if %{with tests}
@@ -32,28 +40,31 @@ pycparser is a complete parser for the C language, written in pure Python.
 It is a module designed to be easily integrated into applications that
 need to parse C source code.
 
-%package -n python3-pycparser
+%package -n python%{python3_pkgversion}-pycparser
-Summary:        %{summary}
+Summary:        C parser and AST generator written in Python
-%{?python_provide:%python_provide python3-pycparser}
+Requires:       python%{python3_pkgversion}-ply = %{ply_version}
+%{?python_provide:%python_provide python%{python3_pkgversion}-pycparser}
 
-%description -n python3-pycparser
+%description -n python%{python3_pkgversion}-pycparser
 pycparser is a complete parser for the C language, written in pure Python.
 It is a module designed to be easily integrated into applications that
 need to parse C source code.
 
 %prep
-%autosetup -p1 -n pycparser-release_v%{version}
+%setup -q -n pycparser-release_v%{version}
+%patch100 -p1 -F5 -b .ply
 
 # remove embedded copy of ply
-rm -r pycparser/ply
+rm -rf pycparser/ply
 
-# Remove relative sys.path from the examples
+# examples
-%{python3} %{SOURCE1} examples
+%{__python3} %{SOURCE1} examples
+dos2unix LICENSE
 
 %build
 %py3_build
 pushd build/lib/pycparser
-%{python3} _build_tables.py
+%{__python3} _build_tables.py
 popd
 
 %install
@@ -61,42 +72,21 @@ popd
 
 %check
 %if %{with tests}
-%{python3} tests/all_tests.py
+%{__python3} tests/all_tests.py
 %endif
- 
+
-%files -n python3-pycparser
+%files -n python%{python3_pkgversion}-pycparser
 %license LICENSE
 %doc examples
 %{python3_sitelib}/pycparser/
 %{python3_sitelib}/pycparser-*.egg-info/
 
 %changelog
-* Tue Feb 08 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 2.20-6
+* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 2.19-3
-- Add automatically generated Obsoletes tag with the python39- prefix
+- Exclude unsupported i686 arch
-  for smoother upgrade from RHEL8
-- Related: rhbz#1990421
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.20-5
+* Wed Nov 20 2019 Lumír Balhar <lbalhar@redhat.com> - 2.19-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Adjusted for Python 3.8 module in RHEL 8
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.20-4
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jun 05 2020 Miro Hrončok <mhroncok@redhat.com> - 2.20-1
-- Update to 2.20 (#1810349)
-
-* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 2.19-3
-- Rebuilt for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
 * Fri Nov 08 2019 Lumír Balhar <lbalhar@redhat.com> - 2.19-1
 - New usptream version 2.19