Compare commits
No commits in common. "c8-stream-3.8" and "c8-beta-stream-3.9" have entirely different histories.
c8-stream-
...
c8-beta-st
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/release_v2.19.tar.gz
|
SOURCES/release_v2.20.tar.gz
|
||||||
|
@ -1 +1 @@
|
|||||||
141582eb2a5ad9fee9bb7646cecb024f0406be8a SOURCES/release_v2.19.tar.gz
|
3a7e92b87f9fe0b863ec99b0c4ee9f90a32a3c3f SOURCES/release_v2.20.tar.gz
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
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']},
|
|
||||||
)
|
|
||||||
|
|
51
SOURCES/pycparser-unbundle-ply.patch
Normal file
51
SOURCES/pycparser-unbundle-ply.patch
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
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},
|
||||||
|
)
|
@ -1,22 +1,20 @@
|
|||||||
# 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
|
%bcond_without tests
|
||||||
|
|
||||||
Name: python-pycparser
|
Name: python-pycparser
|
||||||
Summary: C parser and AST generator written in Python
|
Summary: C parser and AST generator written in Python
|
||||||
Version: 2.19
|
Version: 2.20
|
||||||
Release: 3%{?dist}
|
Release: 3%{?dist}
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://github.com/eliben/pycparser
|
URL: http://github.com/eliben/pycparser
|
||||||
Source0: http://github.com/eliben/pycparser/archive/release_v%{version}.tar.gz
|
Source0: %{url}/archive/release_v%{version}.tar.gz
|
||||||
Source1: pycparser-0.91.1-remove-relative-sys-path.py
|
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
|
# This is Fedora-specific; I don't think we should request upstream to
|
||||||
# remove embedded libraries from their distribuution, when we can remove
|
# remove embedded libraries from their distribuution, when we can remove
|
||||||
# them during packaging.
|
# 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
|
BuildArch: noarch
|
||||||
# Exclude i686 arch. Due to a modularity issue it's being added to the
|
# Exclude i686 arch. Due to a modularity issue it's being added to the
|
||||||
@ -25,10 +23,9 @@ BuildArch: noarch
|
|||||||
ExcludeArch: i686
|
ExcludeArch: i686
|
||||||
|
|
||||||
BuildRequires: python%{python3_pkgversion}-devel
|
BuildRequires: python%{python3_pkgversion}-devel
|
||||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
|
||||||
BuildRequires: dos2unix
|
|
||||||
BuildRequires: python%{python3_pkgversion}-ply
|
|
||||||
BuildRequires: python%{python3_pkgversion}-rpm-macros
|
BuildRequires: python%{python3_pkgversion}-rpm-macros
|
||||||
|
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||||
|
BuildRequires: python%{python3_pkgversion}-ply
|
||||||
|
|
||||||
# for unit tests
|
# for unit tests
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
@ -41,8 +38,8 @@ It is a module designed to be easily integrated into applications that
|
|||||||
need to parse C source code.
|
need to parse C source code.
|
||||||
|
|
||||||
%package -n python%{python3_pkgversion}-pycparser
|
%package -n python%{python3_pkgversion}-pycparser
|
||||||
Summary: C parser and AST generator written in Python
|
Summary: %{summary}
|
||||||
Requires: python%{python3_pkgversion}-ply = %{ply_version}
|
Requires: python%{python3_pkgversion}-ply
|
||||||
%{?python_provide:%python_provide python%{python3_pkgversion}-pycparser}
|
%{?python_provide:%python_provide python%{python3_pkgversion}-pycparser}
|
||||||
|
|
||||||
%description -n python%{python3_pkgversion}-pycparser
|
%description -n python%{python3_pkgversion}-pycparser
|
||||||
@ -51,20 +48,18 @@ It is a module designed to be easily integrated into applications that
|
|||||||
need to parse C source code.
|
need to parse C source code.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n pycparser-release_v%{version}
|
%autosetup -p1 -n pycparser-release_v%{version}
|
||||||
%patch100 -p1 -F5 -b .ply
|
|
||||||
|
|
||||||
# remove embedded copy of ply
|
# remove embedded copy of ply
|
||||||
rm -rf pycparser/ply
|
rm -r pycparser/ply
|
||||||
|
|
||||||
# examples
|
# Remove relative sys.path from the examples
|
||||||
%{__python3} %{SOURCE1} examples
|
%{python3} %{SOURCE1} examples
|
||||||
dos2unix LICENSE
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py3_build
|
%py3_build
|
||||||
pushd build/lib/pycparser
|
pushd build/lib/pycparser
|
||||||
%{__python3} _build_tables.py
|
%{python3} _build_tables.py
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -72,7 +67,7 @@ popd
|
|||||||
|
|
||||||
%check
|
%check
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
%{__python3} tests/all_tests.py
|
%{python3} tests/all_tests.py
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files -n python%{python3_pkgversion}-pycparser
|
%files -n python%{python3_pkgversion}-pycparser
|
||||||
@ -82,11 +77,21 @@ popd
|
|||||||
%{python3_sitelib}/pycparser-*.egg-info/
|
%{python3_sitelib}/pycparser-*.egg-info/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 2.19-3
|
* Mon Jan 18 2021 Tomas Orsava <torsava@redhat.com> - 2.20-3
|
||||||
- Exclude unsupported i686 arch
|
- Convert from Fedora to the python39 module in RHEL8
|
||||||
|
- Resolves: rhbz#1877430
|
||||||
|
|
||||||
* Wed Nov 20 2019 Lumír Balhar <lbalhar@redhat.com> - 2.19-2
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-2
|
||||||
- Adjusted for Python 3.8 module in RHEL 8
|
- 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
|
* Fri Nov 08 2019 Lumír Balhar <lbalhar@redhat.com> - 2.19-1
|
||||||
- New usptream version 2.19
|
- New usptream version 2.19
|
||||||
|
Loading…
Reference in New Issue
Block a user