From 81e21189311c3abd4aae2d33bf9c57c6c88c5071877f31b39b8ec42d65b34e0a Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 16 Mar 2017 18:01:40 +0000 Subject: [PATCH] Accepting request 480701 from devel:languages:python:singlespec singlespec + version update OBS-URL: https://build.opensuse.org/request/show/480701 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycparser?expand=0&rev=15 --- ...ypedef-sa_family_t-from-sys-socket.h.patch | 18 -------- fix-lexer-build.patch | 43 +++++++++++++++++++ pycparser-2.17.tar.gz | 3 ++ python-pycparser.changes | 26 +++++++++++ python-pycparser.spec | 36 +++++++--------- release_v2.14.tar.gz | 3 -- rpmlintrc | 1 + 7 files changed, 89 insertions(+), 41 deletions(-) delete mode 100644 0002-Add-missing-typedef-sa_family_t-from-sys-socket.h.patch create mode 100644 fix-lexer-build.patch create mode 100644 pycparser-2.17.tar.gz delete mode 100644 release_v2.14.tar.gz create mode 100644 rpmlintrc diff --git a/0002-Add-missing-typedef-sa_family_t-from-sys-socket.h.patch b/0002-Add-missing-typedef-sa_family_t-from-sys-socket.h.patch deleted file mode 100644 index b3268da..0000000 --- a/0002-Add-missing-typedef-sa_family_t-from-sys-socket.h.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 2acb22c5606cf151ea31859bd5c3810fc0630150 -Author: Dubslow -Date: Thu Sep 10 18:02:30 2015 -0500 - - Add missing typedef sa_family_t from sys/socket.h - -diff --git a/utils/fake_libc_include/_fake_typedefs.h b/utils/fake_libc_include/_fake_typedefs.h -index 6201cf7..8c8d463 100644 ---- a/utils/fake_libc_include/_fake_typedefs.h -+++ b/utils/fake_libc_include/_fake_typedefs.h -@@ -95,6 +95,7 @@ typedef int pthread_barrier_t; - typedef int pthread_barrierattr_t; - typedef int jmp_buf; - typedef int rlim_t; -+typedef int sa_family_t; - typedef int sigjmp_buf; - typedef int stack_t; - typedef int siginfo_t; diff --git a/fix-lexer-build.patch b/fix-lexer-build.patch new file mode 100644 index 0000000..de135ba --- /dev/null +++ b/fix-lexer-build.patch @@ -0,0 +1,43 @@ +Index: pycparser-release_v2.14/setup.py +=================================================================== +--- pycparser-release_v2.14.orig/setup.py ++++ pycparser-release_v2.14/setup.py +@@ -1,11 +1,11 @@ + import os, sys + try: + from setuptools import setup +- from setuptools.command.install import install as _install ++ from setuptools.command.build import build as _build + from setuptools.command.sdist import sdist as _sdist + except ImportError: + from distutils.core import setup +- from distutils.command.install import install as _install ++ from distutils.command.build import build as _build + from distutils.command.sdist import sdist as _sdist + + +@@ -15,10 +15,10 @@ def _run_build_tables(dir): + cwd=os.path.join(dir, 'pycparser')) + + +-class install(_install): ++class build(_build): + def run(self): +- _install.run(self) +- self.execute(_run_build_tables, (self.install_lib,), ++ _build.run(self) ++ self.execute(_run_build_tables, (self.build_lib,), + msg="Build the lexing/parsing tables") + + +@@ -49,7 +49,7 @@ setup( + classifiers = [ + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 3',], +- packages=['pycparser', 'pycparser.ply'], +- package_data={'pycparser': ['*.cfg']}, +- cmdclass={'install': install, 'sdist': sdist}, ++ packages=['pycparser', 'pycparser.ply', 'utils.fake_libc_include'], ++ package_data={'pycparser': ['*.cfg'], 'utils.fake_libc_include': ['*']}, ++ cmdclass={'build': build, 'sdist': sdist}, + ) diff --git a/pycparser-2.17.tar.gz b/pycparser-2.17.tar.gz new file mode 100644 index 0000000..f83b336 --- /dev/null +++ b/pycparser-2.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0aac31e917c24cb3357f5a4d5566f2cc91a19ca41862f6c3c22dc60a629673b6 +size 231163 diff --git a/python-pycparser.changes b/python-pycparser.changes index 7a79004..08d9f63 100644 --- a/python-pycparser.changes +++ b/python-pycparser.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Thu Mar 16 16:15:40 UTC 2017 - jmatejek@suse.com + +- update to 2.17 + - PR #121: Update bundled PLY version to 3.8 + - Issue #117: Fix parsing of extra semi-colons inside structure declarations. + - PR #109: Update c_generator to add {} around nested named initializers. + - PR #101: Added support for parsing pragmas into the AST. + - Additional fake headers and typedefs, manifest fixes (#97, #106, #111). + - Testing with Python 3.5 instead of 3.3 now (3.4 and 3.5 are the 3.x versions + tested). + - PR #145: More complete support for offsetof() + - Issue #116: Fix line numbers recorded for empty and compound statements. + - Minor performance improvement to the invalid string literal regex. +- drop upstreamed 0002-Add-missing-typedef-sa_family_t-from-sys-socket.h.patch +- move source url to pypi + +------------------------------------------------------------------- +Thu Dec 8 16:40:11 UTC 2016 - jmatejek@suse.com + +- update for multipython build +- move fake_libc to site-packages, where it can be found by pkg_resources + * this also prevents file conflict between python2 and python3 +- fix-lexer-build.patch: fix build process to better generate parser/lexer + files + ------------------------------------------------------------------- Sat Jan 16 14:31:31 UTC 2016 - p.drouand@gmail.com diff --git a/python-pycparser.spec b/python-pycparser.spec index 5a8fdb9..0330260 100644 --- a/python-pycparser.spec +++ b/python-pycparser.spec @@ -1,7 +1,7 @@ # # spec file for package python-pycparser # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,24 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pycparser -Version: 2.14 +Version: 2.17 Release: 0 Summary: C parser in Python License: BSD-3-Clause Group: Development/Languages/Python Url: https://github.com/eliben/pycparser -Source0: https://github.com/eliben/pycparser/archive/release_v%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/p/pycparser/pycparser-%{version}.tar.gz Source99: %{name}-rpmlintrc -#PATCH-FIX-UPSTREAM -Patch0: 0002-Add-missing-typedef-sa_family_t-from-sys-socket.h.patch +Patch1: fix-lexer-build.patch +BuildRequires: %{python_module devel} BuildRequires: fdupes -BuildRequires: python-devel +BuildRequires: python-rpm-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif + +%python_subpackages %description pycparser is a complete parser of the C language, written in pure Python using @@ -42,27 +41,24 @@ the PLY parsing library. It parses C code into an AST and can serve as a front-end for C compilers or analysis tools. %prep -%setup -q -n pycparser-release_v%{version} -%patch0 -p1 +%setup -q -n pycparser-%{version} +%patch1 -p1 # fix end of line sed -i 's/\r//' LICENSE %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} -mkdir -p %{buildroot}/%{_datadir}/%{name} -cp -r utils/fake_libc_include/ %{buildroot}/%{_datadir}/%{name} -%fdupes -s %{buildroot}/%{_datadir}/%{name}/fake_libc_include/ +%python_install +%{python_expand %fdupes %{buildroot}%{$python_sitelib}} %check -python tests/all_tests.py +%python_exec tests/all_tests.py -%files +%files %{python_files} %defattr(-,root,root,-) %doc LICENSE README.rst examples %{python_sitelib}/* -%{_datadir}/%{name} %changelog diff --git a/release_v2.14.tar.gz b/release_v2.14.tar.gz deleted file mode 100644 index c29f63a..0000000 --- a/release_v2.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d4b70c456d45b64171cf82ebad3a58c71d7e913cad016744ad9a66ae1cc8955 -size 120956 diff --git a/rpmlintrc b/rpmlintrc new file mode 100644 index 0000000..dc6d8ca --- /dev/null +++ b/rpmlintrc @@ -0,0 +1 @@ +addFilter("E: devel-file-in-non-devel-package .*fake_libc_include.*")