From 8bac1528a7170f7fd781358719b260c9b6732edda73919b2cce13d0d5acdce2f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 12 Jan 2010 11:52:54 +0000 Subject: [PATCH] Accepting request 29143 from devel:languages:python Copy from devel:languages:python/python-lxml based on submit request 29143 from user coolo OBS-URL: https://build.opensuse.org/request/show/29143 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-lxml?expand=0&rev=15 --- lxml-2.2.2.tar.bz2 | 3 -- lxml-2.2.4.tar.bz2 | 3 ++ lxmldoc-2.2.2.pdf | 3 -- lxmldoc-2.2.4.pdf | 3 ++ python-lxml.changes | 79 +++++++++++++++++++++++++++++++++++++-------- python-lxml.spec | 38 +++++++++++++--------- 6 files changed, 93 insertions(+), 36 deletions(-) delete mode 100644 lxml-2.2.2.tar.bz2 create mode 100644 lxml-2.2.4.tar.bz2 delete mode 100644 lxmldoc-2.2.2.pdf create mode 100644 lxmldoc-2.2.4.pdf diff --git a/lxml-2.2.2.tar.bz2 b/lxml-2.2.2.tar.bz2 deleted file mode 100644 index fdcbb4a..0000000 --- a/lxml-2.2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e6e28d9a2a2fdf79d7bca42f4d5c3330d13d97a8f8d0d74767dfe10e4b5b2ea -size 2039866 diff --git a/lxml-2.2.4.tar.bz2 b/lxml-2.2.4.tar.bz2 new file mode 100644 index 0000000..98cd258 --- /dev/null +++ b/lxml-2.2.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13c14899fffc203cfd1f4d975a5c0e3f7f5b4c901233d0889baaf1cbabd7ff5c +size 2076451 diff --git a/lxmldoc-2.2.2.pdf b/lxmldoc-2.2.2.pdf deleted file mode 100644 index 446431e..0000000 --- a/lxmldoc-2.2.2.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6cc63940702c24ee3804825bd2fb8908df1480d91e7f1286b74cbb182c5bd61 -size 1881020 diff --git a/lxmldoc-2.2.4.pdf b/lxmldoc-2.2.4.pdf new file mode 100644 index 0000000..7a059b5 --- /dev/null +++ b/lxmldoc-2.2.4.pdf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0e2697efec78eb40b3685e8f144a4bb195984cfa5875104d553eed65eb84fb4 +size 1900634 diff --git a/python-lxml.changes b/python-lxml.changes index 5d8e816..1a1d885 100644 --- a/python-lxml.changes +++ b/python-lxml.changes @@ -1,9 +1,60 @@ +------------------------------------------------------------------- +Fri Nov 13 21:50:52 UTC 2009 - toms@suse.de + +- Updated to 2.2.4 (2009-11-11): + Features added + * None + + Bugs fixed + * Static build of libxml2/libxslt was broken. + + +------------------------------------------------------------------- +Fri Oct 30 17:25:06 UTC 2009 - toms@suse.de + +- Updated to 2.2.3 (2009-10-30): + Features added + None + Bugs fixed + * The resolve_entities option did not work in the incremental + feed parser. + * Looking up and deleting attributes without a namespace could + hit a namespaced attribute of the same name instead. + * Late errors during calls to SubElement() (e.g. attribute related + ones) could leave a partially initialised element in the tree. + * Modifying trees that contain parsed entity references could result + in an infinite loop. + * ObjectifiedElement.__setattr__ created an empty-string child + element when the attribute value was rejected as a non-unicode/non-ascii string + * Syntax errors in lxml.cssselect could result in misleading error messages. + * Invalid syntax in CSS expressions could lead to an infinite loop + in the parser of lxml.cssselect. + * CSS special character escapes were not properly handled in lxml.cssselect. + * CSS Unicode escapes were not properly decoded in lxml.cssselect. + * Select options in HTML forms that had no explicit value attribute + were not handled correctly. The HTML standard dictates that their value + is defined by their text content. This is now supported by lxml.html. + * XPath raised a TypeError when finding CDATA sections. This is now fully supported. + * Calling help(lxml.objectify) didn't work at the prompt. + * The ElementMaker in lxml.objectify no longer defines the default namespaces + when annotation is disabled. + * Feed parser failed to honour the 'recover' option on parse errors. + * Diverting the error logging to Python's logging system was broken. + + +------------------------------------------------------------------- +Wed Sep 23 17:37:53 CEST 2009 - toms@suse.de + +- Improved spec file with help from Alexandre D. Rogoski. Thanks! + (debug_package macro) + + ------------------------------------------------------------------- Mon Jul 20 14:04:56 CEST 2009 - toms@suse.de - Updated to 2.2.2 (2009-06-21): Features added - * New helper functions strip_attributes(), strip_elements(), + * New helper functions strip_attributes(), strip_elements(), strip_tags() in lxml.etree to remove attributes/subtrees/tags from a subtree. @@ -60,7 +111,7 @@ Wed Mar 23 12:56:00 CEST 2009 - toms@suse.de See also http://codespeak.net/lxml/changes-2.2.html Features added: - - Allow lxml.html.diff.htmldiff to accept Element objects, + - Allow lxml.html.diff.htmldiff to accept Element objects, not just HTML strings. - XSLT.strparam() class method to wrap quoted string parameters that require escaping. @@ -68,10 +119,10 @@ Wed Mar 23 12:56:00 CEST 2009 - toms@suse.de arguments to the constructor of custom Element classes. - GZip compression support for serialisation to files and file-like objects. - - Support for standalone flag in XML declaration through - tree.docinfo.standalone and by passing standalone=True/False + - Support for standalone flag in XML declaration through + tree.docinfo.standalone and by passing standalone=True/False on serialisation. - + Bugs fixed: - Memory leak in XPath evaluators. - Setting the base attribute in lxml.objectify from a unicode @@ -88,7 +139,7 @@ Wed Mar 23 12:56:00 CEST 2009 - toms@suse.de to a problem in Cython, not lxml itself. - Crash when using an XPath evaluator in multiple threads. - Fixed missing whitespace before Link:... in lxml.html.diff. - + Other changes - The global error log (which is copied into the exception log) is now local to a thread, which fixes some race conditions. @@ -104,7 +155,7 @@ Wed Sep 18 10:00:00 CEST 2008 - toms@suse.de when parsing from a file-like object. This helps custom resolvers when resolving relative URLs, as lixbml2 can prepend them with the path of the source document. - + Bugs fixed * Memory problem when passing documents between threads. * Target parser did not honour the recover option and raised an @@ -170,7 +221,7 @@ Fri Jun 20 11:23:00 CEST 2008 - toms@suse.de * Incorrect evaluation of el.find("tag[child]"). * Windows build was broken. * Moving a subtree from a document created in one thread into a - document of another thread could crash when the rest of the + document of another thread could crash when the rest of the source document is deleted while the subtree is still in use. * Rare crash when serialising to a file object with certain encodings. - Other changes: @@ -235,7 +286,7 @@ Fri Mar 28 11:01:26 CET 2008 - toms@suse.de C compiler options. The same applies for the --with-xslt-config option. - Older changes: - - see + - see http://pypi.python.org/pypi/lxml/2.0.2 http://pypi.python.org/pypi/lxml/2.0.1 http://pypi.python.org/pypi/lxml/2.0 @@ -283,7 +334,7 @@ Thu Aug 30 13:33:22 CEST 2007 - toms@suse.de lxml 1.3.x will continue to support this bug with a Warning, while lxml 2.0 will be strict about well-formed tag names (not only regarding ':'). - Serialising an Element no longer includes its comment and PI siblings - (only ElementTree serialisation includes them). + (only ElementTree serialisation includes them). ------------------------------------------------------------------- @@ -297,13 +348,13 @@ Mon Jul 30 15:10:07 CEST 2007 - toms@suse.de - etree.fromstring() now supports parsing both HTML and XML, depending on the parser you pass - Support base_url keyword argument in HTML() and XML() - + - Bugs fixed: - Parsing from Python Unicode strings failed on some platforms - Element() did not raise an exception on tag names containing ':' - Element.getiterator(tag) did not accept Comment and ProcessingInstruction - as tags. It also accepts Element now. - + as tags. It also accepts Element now. + ------------------------------------------------------------------- Fri Jan 19 13:03:00 CET 2007 - toms@suse.de @@ -326,7 +377,7 @@ Fri Jan 19 13:03:00 CET 2007 - toms@suse.de - HTML script/style content was not propagated to .text - Show text xincluded between text nodes correctly in .text and .tail - 'integer - objectify.StringElement' operation was not supported - + ------------------------------------------------------------------- Fri Dec 1 11:12:37 CET 2006 - toms@suse.de diff --git a/python-lxml.spec b/python-lxml.spec index ba66f71..696861c 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,7 +1,7 @@ # -# spec file for package python-lxml (Version 2.2.2) +# spec file for package python-lxml (Version 2.2.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,9 +21,9 @@ Name: python-lxml Url: http://codespeak.net/lxml Summary: A Pythonic Binding for the libxml2 and libxslt Libraries -Version: 2.2.2 +Version: 2.2.4 Release: 1 -License: BSD 3-clause (or similar) +License: BSD3c Group: Development/Libraries/Python Source: %{modname}-%{version}.tar.bz2 Source1: %{modname}doc-%{version}.pdf @@ -33,6 +33,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: pyxml # Requires: libxml2 libxslt BuildRequires: libxslt-devel pyrex python-devel pyxml +BuildRequires: fdupes +# Use test as told in http://lists.opensuse.org/opensuse-packaging/2009-08/msg00110.html +#%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} +#BuildArch: noarch +#%{!?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(True)")} +#%endif %description lxml is a Pythonic binding for the libxml2 and libxslt libraries. It @@ -49,23 +56,18 @@ Authors: Martijn Faassen - creator of lxml and initial main developer and others + %package doc Group: Development/Libraries/Python -Summary: Documentation for python-lxml Package -License: BSD 3-clause (or similar) +Summary: Documentation for %{name} +License: BSD3c %description doc -Documentation for python-lxml package +Documentation for %{modname} (HTML and PDF). -Authors: --------- - Stefan Behnel - main developer and maintainer - Martijn Faassen - creator of lxml and initial main developer - and others -% --------------------------------- %prep %setup -q -n %{modname}-%{version} @@ -76,15 +78,19 @@ export CFLAGS="$RPM_OPT_FLAGS" %install %{__python} setup.py install \ + --optimize 1 \ --prefix=%{_prefix} \ --root=$RPM_BUILD_ROOT \ - --record-rpm=INSTALLED_FILES.txt -# Avoid warnings from rpmlint: + --record-rpm=INSTALLED_FILES.txt \ +%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} + --install-lib=%{python_sitelib} +%endif [ -e doc/rest2html.py ] && %{__mkdir} doc/examples && %{__mv} doc/rest2html.py doc/examples/ -# Remove any duplicate files: +# Avoid warnings from rpmlint: for i in doc/html/pubkey.asc ; do [ -e "$i" ] && %{__rm} "$i" done +%fdupes $RPM_BUILD_ROOT%{py_sitedir} $RPM_BUILD_ROOT%{python_sitelib} %clean %{__rm} -rf %{buildroot}