.gitignore

@@ -1 +1 @@
-SOURCES/ply-3.9.tar.gz
+SOURCES/ply-3.11.tar.gz

.python-ply.metadata

@@ -1 +1 @@
-3909910312996082dfa9ca9b5300113636163b66 SOURCES/ply-3.9.tar.gz
+10a555a32095991fbc7f7ed10c677a14e21fad1d SOURCES/ply-3.11.tar.gz

SOURCES/Make-MD5-fingerprint-FIPS-compatible.patch

@@ -1,27 +0,0 @@
-From 129a530a7165dbb83ab9a5a723318b51dcd59edd Mon Sep 17 00:00:00 2001
-From: Christian Heimes <cheimes@redhat.com>
-Date: Mon, 11 Nov 2019 14:38:29 +0100
-Subject: [PATCH] Make MD5 fingerprint FIPS compatible
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1747490
-Signed-off-by: Christian Heimes <cheimes@redhat.com>
----
- ply/yacc.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ply/yacc.py b/ply/yacc.py
-index 6842832..9e1b07a 100644
---- a/ply/yacc.py
-+++ b/ply/yacc.py
-@@ -2963,7 +2963,7 @@ class ParserReflect(object):
-         except ImportError:
-             from md5 import md5
-         try:
--            sig = md5()
-+            sig = md5(usedforsecurity=False)
-             if self.start:
-                 sig.update(self.start.encode('latin-1'))
-             if self.prec:
--- 
-2.23.0
-

SPECS/python-ply.spec

@@ -1,28 +1,19 @@
 %global modname ply
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%bcond_without python3
-%else
-%bcond_with python3
-%endif
-
-%if 0%{?rhel} > 7
-# Disable python2 build by default
-%bcond_with python2
-%else
-%bcond_without python2
-%endif
+%bcond_without tests
 
 Name:           python-%{modname}
 Summary:        Python Lex-Yacc
-Version:        3.9
-Release:        9%{?dist}
+Version:        3.11
+Release:        10%{?dist}
 License:        BSD
 URL:            http://www.dabeaz.com/ply/
 Source0:        http://www.dabeaz.com/ply/%{modname}-%{version}.tar.gz
 BuildArch:      noarch
-
-Patch1:         Make-MD5-fingerprint-FIPS-compatible.patch
+# 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
 
 %description
 PLY is a straightforward lex/yacc implementation. Here is a list of its 
@@ -38,38 +29,14 @@ essential features:
   functionality. In other words, it's not a large parsing framework or a 
   component of some larger system. 
 
-%if %{with python2}
-%package -n python2-%{modname}
+%package -n python%{python3_pkgversion}-%{modname}
 Summary:        Python Lex-Yacc
-%{?python_provide:%python_provide python2-%{modname}}
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}}
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-rpm-macros
 
-%description -n python2-%{modname}
-PLY is a straightforward lex/yacc implementation. Here is a list of its 
-essential features:
-* It is implemented entirely in Python.
-* It uses LR-parsing which is reasonably efficient and well suited for larger 
-  grammars.
-* PLY provides most of the standard lex/yacc features including support 
-  for empty productions, precedence rules, error recovery, and support 
-  for ambiguous grammars.
-* PLY is straightforward to use and provides very extensive error checking.
-* PLY doesn't try to do anything more or less than provide the basic lex/yacc 
-  functionality. In other words, it's not a large parsing framework or a 
-  component of some larger system.
-
-Python 2 version.
-%endif # with python2
-
-%if %{with python3}
-%package -n python3-%{modname}
-Summary:        Python Lex-Yacc
-%{?python_provide:%python_provide python3-%{modname}}
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-
-%description -n python3-%{modname}
+%description -n python%{python3_pkgversion}-%{modname}
 PLY is a straightforward lex/yacc implementation. Here is a list of its 
 essential features:
 * It is implemented entirely in Python.
@@ -84,101 +51,73 @@ essential features:
   component of some larger system.
 
 Python 3 version.
-%endif # with python3
 
 %prep
-%autosetup -c -N
-
-pushd %{modname}-%{version}
-%patch1 -p1
-popd
-
-%if %{with python2}
-cp -ai %{modname}-%{version} python2
-find python2/example/ -type f -exec chmod -x {} ';'
-find python2/example/ -type f -name '*.py' -exec sed -i \
+%autosetup -n %{modname}-%{version}
+find example/ -type f -executable -exec chmod -x {} ';'
+find example/ -type f -name '*.py' -exec sed -i \
   -e '1{\@^#!/usr/bin/env python@d}' -e '1{\@^#!/usr/local/bin/python@d}' \
   {} ';'
-rm -rf python2/*.egg-info
+rm -rf *.egg-info
 # extract license block from beginning of README.md
-grep -B1000 "POSSIBILITY OF SUCH DAMAGE" python2/README.md > python2/LICENSE
-%endif # with python2
-
-%if %{with python3}
-cp -ai %{modname}-%{version} python3
-# extract license block from beginning of README.md
-grep -B1000 "POSSIBILITY OF SUCH DAMAGE" python3/README.md > python3/LICENSE
-%endif # with python3
+grep -B1000 "POSSIBILITY OF SUCH DAMAGE" README.md > LICENSE
 
 %build
-%if %{with python2}
-pushd python2
-  %py2_build
-popd
-%endif # with python2
-
-%if 0%{?with_python3}
-pushd python3
-  %py3_build
-popd
-%endif # with python3
+%py3_build
 
 %install
-%if %{with python2}
-pushd python2
-  %py2_install
-popd
-%endif # with python2
-
-%if %{with python3}
-pushd python3
-  %py3_install
-popd
-%endif # with python3
+%py3_install
 
+%if %{with tests}
 %check
-%if %{with python2}
-pushd python2/test
-  ./cleanup.sh
-  %{__python2} testlex.py
-  %{__python2} testyacc.py
-popd
-%endif # with python2
-
-%if %{with python3}
-pushd python3/test
+pushd test
   ./cleanup.sh
   %{__python3} testlex.py
   %{__python3} testyacc.py
 popd
-%endif # with python3
+%endif
 
-%if %{with python2}
-%files -n python2-%{modname}
-%doc python2/CHANGES python2/README.md
-%license python2/LICENSE
-%{python2_sitelib}/%{modname}/
-%{python2_sitelib}/%{modname}-%{version}-*.egg-info/
-%endif # with python2
-
-%if %{with python3}
-%files -n python3-%{modname}
-%doc python3/CHANGES python3/README.md
-%license python3/LICENSE
+%files -n python%{python3_pkgversion}-%{modname}
+%doc CHANGES README.md
+%license LICENSE
 %{python3_sitelib}/%{modname}/
 %{python3_sitelib}/%{modname}-%{version}-*.egg-info/
-%endif # with python3
 
 %changelog
-* Wed Jan  6 14:57:34 CET 2021 Christian Heimes <cheimes@redhat.com> - 3.9-9
-- Include README.MD and LICENSE (#1464435)
+* Tue Jan  5 15:25:57 CET 2021 Christian Heimes <cheimes@redhat.com> - 3.11-10
+- Extract and ship license file (#1912893)
+- Resolves: rhbz#1877430
 
-* Mon Nov 11 2019 Christian Heimes <cheimes@redhat.com> - 3.9-8
-- Make MD5 fingerprint FIPS compliant
-- Resolves: rhbz#1747490
+* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 3.11-8
+- Exclude unsupported i686 arch
 
-* Fri Jun 15 2018 Charalampos Stratakis <cstratak@redhat.com> - 3.9-7
-- Conditionalize the python2 subpackage
+* Wed Nov 20 2019 Lumír Balhar <lbalhar@redhat.com> - 3.11-7
+- Adjusted for Python 3.8 module in RHEL 8
+
+* Sun Oct 20 2019 Miro Hrončok <mhroncok@redhat.com> - 3.11-6
+- 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> - 3.11-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 3.11-4
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jan 11 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.11-1
+- Update to 3.11
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.9-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 3.9-7
+- Rebuilt for Python 3.7
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild