From: wrobell Date: Sun, 22 May 2011 01:42:24 +0000 (+0000) Subject: - ver. 2.3 X-Git-Tag: auto/th/python-lxml-2_3-1~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpython-lxml.git;a=commitdiff_plain;h=ae91e877bf8de1bfe08400a0fd0674a362396540 - ver. 2.3 Changed files: python-lxml.spec -> 1.28 python3.patch -> 1.2 --- diff --git a/python-lxml.spec b/python-lxml.spec index 53e98eb..45e2c39 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -8,13 +8,12 @@ Summary: A Pythonic binding for the libxml2 and libxslt libraries Summary(pl.UTF-8): Pythonowe wiązanie do bibliotek libxml2 i libxslt Name: python-%{module} -Version: 2.2.8 -Release: 2 +Version: 2.3 +Release: 1 License: BSD Group: Libraries/Python Source0: http://codespeak.net/lxml/%{module}-%{version}.tgz -# Source0-md5: d6c612d63a84d79440912a1b29d3b981 -Patch0: python3.patch +# Source0-md5: a245a015fd59b63e220005f263e1682a URL: http://codespeak.net/lxml/ BuildRequires: libxml2-devel BuildRequires: libxslt-devel @@ -60,7 +59,6 @@ API and internal documentation for lxml library. %prep %setup -q -n %{module}-%{version} -%patch0 -p1 %build %if %{with python2} @@ -87,8 +85,6 @@ rm -rf $RPM_BUILD_ROOT install \ --root=$RPM_BUILD_ROOT \ --optimize=2 - -%py3_postclean %endif # cleanup for packaging @@ -110,6 +106,7 @@ rm -rf $RPM_BUILD_ROOT %doc docs/* CHANGES.txt CREDITS.txt TODO.txt %dir %{py_sitedir}/lxml %{py_sitedir}/lxml/*.py[co] +%{py_sitedir}/lxml/isoschematron %dir %{py_sitedir}/lxml/html %{py_sitedir}/lxml/html/*.py[co] %attr(755,root,root) %{py_sitedir}/lxml/etree.so @@ -122,11 +119,11 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc docs/* CHANGES.txt CREDITS.txt TODO.txt %dir %{py3_sitedir}/lxml -%{py3_sitedir}/lxml/*.py[co] -%dir %{py3_sitedir}/lxml/html -%{py3_sitedir}/lxml/html/*.py[co] -%attr(755,root,root) %{py3_sitedir}/lxml/etree.so -%attr(755,root,root) %{py3_sitedir}/lxml/objectify.so +%attr(755,root,root) %{py3_sitedir}/lxml/*.so +%{py3_sitedir}/lxml/__pycache__ +%{py3_sitedir}/lxml/*.py +%{py3_sitedir}/lxml/isoschematron +%{py3_sitedir}/lxml/html %{py3_sitedir}/lxml-*.egg-info %endif diff --git a/python3.patch b/python3.patch deleted file mode 100644 index f8de0ae..0000000 --- a/python3.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- lxml-2.2.6/src/lxml/html/_html5builder.py.wiget 2009-09-11 10:55:58.000000000 +0200 -+++ lxml-2.2.6/src/lxml/html/_html5builder.py 2010-03-27 16:04:28.693916731 +0100 -@@ -7,6 +7,11 @@ html5lib style guide. - from html5lib.treebuilders import _base, etree as etree_builders - from lxml import html, etree - -+try: -+ empty_string = unicode() -+except NameError: -+ empty_string = str() -+ - - class DocumentType(object): - -@@ -77,7 +82,7 @@ class TreeBuilder(_base.TreeBuilder): - self.doctype.systemId)) - buf.append('>') - buf.append('') -- root = html.fromstring(u''.join(buf)) -+ root = html.fromstring(empty_string.join(buf)) - - # Append the initial comments: - for comment in self.initialComments: ---- lxml-2.2.6/src/lxml/html/_diffcommand.py.wiget 2009-09-11 10:55:58.000000000 +0200 -+++ lxml-2.2.6/src/lxml/html/_diffcommand.py 2010-03-27 16:02:10.727258598 +0100 -@@ -34,7 +34,7 @@ def main(args=None): - if options.annotation: - return annotate(options, args) - if len(args) != 2: -- print 'Error: you must give two files' -+ print('Error: you must give two files') - parser.print_help() - sys.exit(1) - file1, file2 = args -@@ -82,6 +82,6 @@ def split_body(html): - return pre, html, post - - def annotate(options, args): -- print "Not yet implemented" -+ print("Not yet implemented") - sys.exit(1) -