.gitignore

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

.python-pycparser.metadata

@@ -1 +1 @@
-849ba755b3b93716297a3d0a1b9be5d58314e63d SOURCES/release_v2.14.tar.gz
+141582eb2a5ad9fee9bb7646cecb024f0406be8a SOURCES/release_v2.19.tar.gz

SPECS/python-pycparser.spec

@@ -1,20 +1,14 @@
-%if 0%{?fedora} || 0%{?rhel} >= 8
+# Ensure that pycparser uses the same YACC __tabversion__ as python-ply
-%global with_python3 1
+# package to prevent "yacc table file version is out of date" problem.
-%endif
+%define ply_version %(LC_ALL=C rpm -q --qf '%%{VERSION}' python%{python3_pkgversion}-ply | grep -Eo '^[^.]+\.[^.]+')
 
-%if 0%{?rhel} > 7
+%bcond_without tests
-# Disable python2 build by default
-%bcond_with python2
-%else
-%bcond_without python2
-%endif
 
 Name:           python-pycparser
 Summary:        C parser and AST generator written in Python
-Version:        2.14
+Version:        2.19
-Release:        14%{?dist}
+Release:        3%{?dist}
 License:        BSD
-Group:          System Environment/Libraries
 URL:            http://github.com/eliben/pycparser
 Source0:        http://github.com/eliben/pycparser/archive/release_v%{version}.tar.gz
 Source1:        pycparser-0.91.1-remove-relative-sys-path.py
@@ -25,52 +19,36 @@ Patch100:       pycparser-2.10-ply.patch
 # them during packaging.
 
 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
 
-%if %{with python2}
+BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python2-devel python2-setuptools
+BuildRequires:  python%{python3_pkgversion}-setuptools
-
-# for unit tests
-BuildRequires:  python2-ply >= 3.6
-%endif # with python2
-
 BuildRequires:  dos2unix
+BuildRequires:  python%{python3_pkgversion}-ply
+BuildRequires:  python%{python3_pkgversion}-rpm-macros
 
-%if 0%{?with_python3}
-BuildRequires:  python3-devel python3-setuptools
 # for unit tests
-BuildRequires:  python3-ply       
+%if %{with tests}
-%endif # if with_python3
+BuildRequires:  cpp
+%endif
 
 %description
 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.
 
-%if %{with python2}
+%package -n python%{python3_pkgversion}-pycparser
-%package -n python2-pycparser
 Summary:        C parser and AST generator written in Python
-Group:          System Environment/Libraries
+Requires:       python%{python3_pkgversion}-ply = %{ply_version}
-Requires:       python2-ply >= 3.6
+%{?python_provide:%python_provide python%{python3_pkgversion}-pycparser}
-%{?python_provide:%python_provide python2-pycparser}
 
-%description -n python2-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.
-%endif # with python2
-
-%if 0%{?with_python3}
-%package -n python3-pycparser
-Summary:        C parser and AST generator written in Python
-Group:          System Environment/Libraries
-Requires:       python3-ply
-%{?python_provide:%python_provide python3-pycparser}
-
-%description -n python3-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.
-%endif # if with_python3
 
 %prep
 %setup -q -n pycparser-release_v%{version}
@@ -80,65 +58,72 @@ need to parse C source code.
 rm -rf pycparser/ply
 
 # examples
-%if 0%{?with_python3}
 %{__python3} %{SOURCE1} examples
-%else
-%{__python2} %{SOURCE1} examples
-%endif
 dos2unix LICENSE
 
 %build
-%if %{with python2}
-%py2_build
-pushd build/lib/pycparser
-%{__python2} _build_tables.py
-popd
-%endif # with python2
-
-%if 0%{?with_python3}
 %py3_build
 pushd build/lib/pycparser
 %{__python3} _build_tables.py
 popd
-%endif # with_python3
 
 %install
-%if %{with python2}
-%py2_install
-%endif # with python2
-
-%if 0%{?with_python3}
 %py3_install
-%endif # with_python3
 
 %check
-%if %{with python2}
+%if %{with tests}
-%{__python2} tests/all_tests.py
-%endif # with python2
-
-%if 0%{?with_python3}
 %{__python3} tests/all_tests.py
-%endif # with_python3
+%endif
 
- %if %{with python2}
+%files -n python%{python3_pkgversion}-pycparser
-%files -n python2-pycparser
-%license LICENSE
-%doc examples
-%{python2_sitelib}/pycparser/
-%{python2_sitelib}/pycparser-*.egg-info
-%endif # with python2
-
-%if 0%{?with_python3}
-%files -n python3-pycparser
 %license LICENSE
 %doc examples
 %{python3_sitelib}/pycparser/
-%{python3_sitelib}/pycparser-*.egg-info
+%{python3_sitelib}/pycparser-*.egg-info/
-%endif # with_python3
 
 %changelog
-* Sun Jun 10 2018 Charalampos Stratakis <cstratak@redhat.com> - 2.14-14
+* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 2.19-3
-- Conditionalize the python2 subpackage
+- Exclude unsupported i686 arch
+
+* Wed Nov 20 2019 Lumír Balhar <lbalhar@redhat.com> - 2.19-2
+- Adjusted for Python 3.8 module in RHEL 8
+
+* Fri Nov 08 2019 Lumír Balhar <lbalhar@redhat.com> - 2.19-1
+- New usptream version 2.19
+
+* Sun Oct 20 2019 Miro Hrončok <mhroncok@redhat.com> - 2.14-23
+- Subpackage python2-ply has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.14-22
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 2.14-21
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.14-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jun 10 2019 Marcel Plch <mplch@redhat.com> - 2.14-19
+- Avoid invalid unicode escape sequences in Py3.8
+
+* Tue Feb 26 2019 Christian Heimes <cheimes@redhat.com> - 2.14-18
+- Add build dependency on cpp for unit tests
+- Add dependency on python-ply version to prevent "yacc table file version is out of date"
+- Fixes RHBZ#1668230
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.14-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.14-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.14-15
+- Rebuilt for Python 3.7
+
+* Mon Feb 12 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.14-14
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.14-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild