[python-pycparser] Update to latest upstream.
Eric Smith
brouhaha at fedoraproject.org
Wed Aug 20 18:58:32 UTC 2014
commit ff308dee8871ae5ca5ca7aa1eaada28e5d84af71
Author: Eric Smith <brouhaha at fedoraproject.org>
Date: Wed Aug 20 12:58:28 2014 -0600
Update to latest upstream.
.gitignore | 1 +
pycparser-0.91.1-disable-embedded-ply.patch | 38 ---------------------------
pycparser-0.91.1-tables-sys-path.patch | 12 --------
pycparser-0.91.1-unittests-sys-path.patch | 24 -----------------
pycparser-2.10-ply.patch | 38 +++++++++++++++++++++++++++
python-pycparser.spec | 23 +++++----------
sources | 2 +-
7 files changed, 48 insertions(+), 90 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 52e4b12..cb641f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/release_v2.09.1.tar.gz
+/release_v2.10.tar.gz
diff --git a/pycparser-2.10-ply.patch b/pycparser-2.10-ply.patch
new file mode 100644
index 0000000..d1e1f53
--- /dev/null
+++ b/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']},
+ )
+
diff --git a/python-pycparser.spec b/python-pycparser.spec
index 82e969d..3567d7e 100644
--- a/python-pycparser.spec
+++ b/python-pycparser.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%if 0%{?fedora} > 12
%global with_python3 1
%else
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
@@ -6,23 +6,15 @@
Name: python-pycparser
Summary: C parser and AST generator written in Python
-Version: 2.09.1
-Release: 9%{?dist}
+Version: 2.10
+Release: 1%{?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
-Patch0: pycparser-0.91.1-unittests-sys-path.patch
-# Submitted as upstream issue #11:
-# https://github.com/eliben/pycparser/issues/11
-
-Patch1: pycparser-0.91.1-tables-sys-path.patch
-# Submitted as upstream issue #12:
-# https://github.com/eliben/pycparser/issues/12
-
-Patch100: pycparser-0.91.1-disable-embedded-ply.patch
+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.
@@ -62,9 +54,7 @@ need to parse C source code.
%prep
%setup -q -n pycparser-release_v%{version}
-%patch0 -p1 -b .unittests-sys-path
-%patch1 -p1 -b .tables-sys-path
-%patch100 -p1 -b .orig
+%patch100 -p1 -b .ply
# remove embedded copy of ply
rm -rf pycparser/ply
@@ -124,6 +114,9 @@ popd
%endif # with_python3
%changelog
+* Wed Aug 20 2014 Eric Smith <brouhaha at fedoraproject.org> 2.10-1
+- Update to latest upstream.
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.09.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 2bc93a8..595b008 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6a3be32513fd0d5d9acce2619abdf98 release_v2.09.1.tar.gz
+82ab1fa524198908050550e7780b85e1 release_v2.10.tar.gz
More information about the scm-commits
mailing list