From aa358f032dc0cde0b82003f8ca9d0c1e68707e29 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 11 Jan 2019 13:59:16 +0100 Subject: [PATCH] Update to 3.11 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + python-ply.spec | 65 ++++++++++++++++--------------------------------- sources | 2 +- 3 files changed, 23 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index 9ce14be..61dc46d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ ply-3.3.tar.gz /ply-3.6.tar.gz /ply-3.8.tar.gz /ply-3.9.tar.gz +/ply-3.11.tar.gz diff --git a/python-ply.spec b/python-ply.spec index 9953a52..56b928a 100644 --- a/python-ply.spec +++ b/python-ply.spec @@ -1,15 +1,9 @@ %global modname ply -%if 0%{?fedora} || 0%{?rhel} >= 8 -%bcond_without python3 -%else -%bcond_with python3 -%endif - Name: python-%{modname} Summary: Python Lex-Yacc -Version: 3.9 -Release: 8%{?dist} +Version: 3.11 +Release: 1%{?dist} License: BSD URL: http://www.dabeaz.com/ply/ Source0: http://www.dabeaz.com/ply/%{modname}-%{version}.tar.gz @@ -51,7 +45,6 @@ essential features: Python 2 version. -%if %{with python3} %package -n python3-%{modname} Summary: Python Lex-Yacc %{?python_provide:%python_provide python3-%{modname}} @@ -73,71 +66,55 @@ essential features: component of some larger system. Python 3 version. -%endif # with python3 %prep -%autosetup -c -mv %{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} +#mv %{modname}-%{version} python2 +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 -%if %{with python3} -cp -ai python2 python3 -%endif # with python3 +#if %{with python3} +#cp -ai python2 python3 +#endif # with python3 %build -pushd python2 - %py2_build -popd - -%if 0%{?with_python3} -pushd python3 - %py3_build -popd -%endif # with python3 +%py2_build +%py3_build %install -pushd python2 - %py2_install -popd - -%if %{with python3} -pushd python3 - %py3_install -popd -%endif # with python3 +%py2_install +%py3_install %check -pushd python2/test +pushd test ./cleanup.sh %{__python2} testlex.py %{__python2} testyacc.py popd -%if %{with python3} -pushd python3/test +pushd test ./cleanup.sh %{__python3} testlex.py %{__python3} testyacc.py popd -%endif # with python3 %files -n python2-%{modname} -%doc python2/CHANGES +%doc CHANGES README.md %{python2_sitelib}/%{modname}/ %{python2_sitelib}/%{modname}-%{version}-*.egg-info/ -%if %{with python3} %files -n python3-%{modname} -%doc python3/CHANGES +%doc CHANGES README.md %{python3_sitelib}/%{modname}/ %{python3_sitelib}/%{modname}-%{version}-*.egg-info/ -%endif # with python3 %changelog +* Fri Jan 11 2019 Igor Gnatenko - 3.11-1 +- Update to 3.11 + * Sat Jul 14 2018 Fedora Release Engineering - 3.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index dd3a2b5..ab1b80f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5c5767376eff902617fd9874f0c76b7 ply-3.9.tar.gz +SHA512 (ply-3.11.tar.gz) = 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008