diff --git a/pyparsing-1.5.3.tar.bz2 b/pyparsing-1.5.3.tar.bz2 deleted file mode 100644 index 11edd28..0000000 --- a/pyparsing-1.5.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c9731270d41ab4a6d239701b2035c8731602fe525c74c98d131a76a7623af82 -size 1058221 diff --git a/pyparsing-1.5.6.tar.gz b/pyparsing-1.5.6.tar.gz new file mode 100644 index 0000000..ba35225 --- /dev/null +++ b/pyparsing-1.5.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c84aa4500e82d5aa2c0842d5628c5da985e68ac1fb33554e0e5547eb3c85a75 +size 1418892 diff --git a/python-pyparsing.changes b/python-pyparsing.changes index 3d865fb..b2417cd 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -1,5 +1,45 @@ +------------------------------------------------------------------- +Thu Jun 30 08:33:22 UTC 2011 - saschpe@suse.de + +- Update to version 1.5.6: + * Cleanup of parse action normalizing code, to be more version-tolerant, + and robust in the face of future Python versions + * Removal of exception cacheing, addressing a memory leak condition + in Python 3. + * Fixed bug when using packrat parsing, where a previously parsed + expression would duplicate subsequent tokens + * Fixed bug in srange, which accepted escaped hex characters of the + form '\0x##', but should be '\x##'. Both forms will be supported + for backwards compatibility. + * Added the Verilog parser to the provided set of examples, under the + MIT license. + * Added the excludeChars argument to the Word class, to simplify defining + a word composed of all characters in a large range except for one or two. + * Added optional overlap parameter to scanString, to return overlapping + matches found in the source text. + * Updated oneOf internal regular expression generation, with improved + parse time performance. + * Slight performance improvement in transformString, removing empty + strings from the list of string fragments built while scanning the + source text, before calling ''.join. Especially useful when using + transformString to strip out selected text. + * Enhanced form of using the "expr('name')" style of results naming, + in lieu of calling setResultsName. If name ends with an '*', then + this is equivalent to expr.setResultsName('name',listAllMatches=True). + * Fixed up internal list flattener to use iteration instead of recursion, + to avoid stack overflow when transforming large files. +- Changes from version 1.5.5: + * Typo in Python3 version of pyparsing, "builtin" should be "builtins". +- Changes from version 1.5.4: + * Fixed __builtins__ and file references in Python 3 code, thanks to + Greg Watson, saulspatz, sminos, and Mark Summerfield for reporting + their Python 3 experiences. +- Spec file cleanup: + * Regenerated with py2pack, much simpler spec file + * Fixed license to MIT, it's not GPLv2+ + ------------------------------------------------------------------- Wed Jul 7 00:32:17 UTC 2010 - pascal.bleser@opensuse.org -- initial package (1.5.3) +- Initial package (1.5.3) diff --git a/python-pyparsing.spec b/python-pyparsing.spec index c3f0754..e991e87 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -11,30 +11,27 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. - +# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} - Name: python-pyparsing -Version: 1.5.3 -Release: 1 -Summary: Grammar Parser Library for Python -# http://prdownloads.sourceforge.net/pyparsing/pyparsing-%{version}.zip -Source: pyparsing-%{version}.tar.bz2 +Version: 1.5.6 +Release: 0 Url: http://pyparsing.wikispaces.com/ -Group: Development/Libraries/Python -License: GNU General Public License version 2 or later (GPL v2 or later) +Summary: Grammar Parser Library for Python +License: MIT License +Group: Development/Languages/Python +Source: http://pypi.python.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python python-devel -%if 0%{?suse_version} >= 1120 +BuildRequires: python-devel +%if 0%{?suse_version} +%py_requires +%if 0%{?suse_version} > 1110 BuildArch: noarch %endif -%py_requires +%endif +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description The pyparsing module is an alternative approach to creating and executing @@ -43,7 +40,6 @@ expressions. The pyparsing module provides a library of classes that client code uses to construct the grammar directly in Python code. %package doc - Summary: Grammar Parser Library for Python - Documentation Group: Development/Libraries/Python Requires: %{name} = %{version} @@ -58,48 +54,26 @@ This package contains the documentation of %{name}, under the directory %{_docdir}/%{name}/ %prep -%setup -q -n "pyparsing-%{version}" -%__sed -i 's/\r$//' CHANGES LICENSE -find docs/ -type f -a \ - ! \( -iname '*.png' -o -iname '*.jpg' -o -iname '*.gif' \) \ - -exec %__sed -i 's/\r$//' {} \; +%setup -q -n pyparsing-%{version} %build -%__python ./setup.py build +python setup.py build +# Fix wrong EOL encoding: +sed -i 's/\r$//' CHANGES LICENSE README docs/examples/* docs/htmldoc/epydoc.{js,css} %install -%__python ./setup.py install \ - --prefix="%{_prefix}" \ - --root="%{buildroot}" \ - --record-rpm=files.lst - -%__install -d "%{buildroot}%{_docdir}/%{name}" -for f in CHANGES LICENSE README; do - %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/" - echo "%doc %{_docdir}/%{name}/$f" >> files.lst -done - -echo -n >docfiles.lst -for f in docs/*; do - ff=$(basename "$f") - %__cp -a "$f" "%{buildroot}%{_docdir}/%{name}/$ff" - echo "%doc %{_docdir}/%{name}/$ff" >>docfiles.lst -done +python setup.py install --prefix=%{_prefix} --root=%{buildroot} %clean -%__rm -rf "%{buildroot}" +rm -rf %{buildroot} -%files -f files.lst -%defattr(-,root,root) -%dir %doc %{_docdir}/%{name} +%files +%defattr(-,root,root,-) +%doc CHANGES LICENSE README +%{python_sitelib}/* -%files doc -f docfiles.lst -%defattr(-,root,root) -%dir %doc %{_docdir}/%{name} +%files doc +%defattr(-,root,root,-) +%doc docs/* -# vim: set sw=3 ts=3 noet: -# Local Variables: -# mode: rpm-spec -# tab-width: 3 -# End: %changelog