From 0d7ff158ce071c326b68573b3a568467269dfe979d115ddd7126528821a0054d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 24 Apr 2009 20:02:40 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-lxml?expand=0&rev=11 --- lxml-2.1.2.tar.bz2 | 3 -- lxml-2.2.tar.bz2 | 3 ++ lxmldoc-2.1.2.pdf | 3 -- lxmldoc-2.2.pdf | 3 ++ python-lxml-rpmlintrc | 6 ++++ python-lxml.changes | 57 ++++++++++++++++++++++++++++++ python-lxml.spec | 81 +++++++++++++++++++++++++++++++++++-------- 7 files changed, 136 insertions(+), 20 deletions(-) delete mode 100644 lxml-2.1.2.tar.bz2 create mode 100644 lxml-2.2.tar.bz2 delete mode 100644 lxmldoc-2.1.2.pdf create mode 100644 lxmldoc-2.2.pdf create mode 100644 python-lxml-rpmlintrc diff --git a/lxml-2.1.2.tar.bz2 b/lxml-2.1.2.tar.bz2 deleted file mode 100644 index 49b5cf5..0000000 --- a/lxml-2.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58d1aef59d9989fe04534d61278fa47d4d48c43c0f9ff2dc47c5d9a1259522c8 -size 1861384 diff --git a/lxml-2.2.tar.bz2 b/lxml-2.2.tar.bz2 new file mode 100644 index 0000000..ae96a58 --- /dev/null +++ b/lxml-2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5261f5f30679615b6babcc645ad3c6b38476bc5a300c37e53f840327e5d6fcd0 +size 2020417 diff --git a/lxmldoc-2.1.2.pdf b/lxmldoc-2.1.2.pdf deleted file mode 100644 index 0cf5815..0000000 --- a/lxmldoc-2.1.2.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ceec4476f640c46727c6bd124b2b857d450ac5954fe6744ac9bf17f2c18c6f1 -size 1755028 diff --git a/lxmldoc-2.2.pdf b/lxmldoc-2.2.pdf new file mode 100644 index 0000000..d5f3258 --- /dev/null +++ b/lxmldoc-2.2.pdf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5eeadb645a9a45f68f6c2d13aeccd9e7b14e0c5ce289f921147c3b55a701237c +size 1867462 diff --git a/python-lxml-rpmlintrc b/python-lxml-rpmlintrc new file mode 100644 index 0000000..79a23a9 --- /dev/null +++ b/python-lxml-rpmlintrc @@ -0,0 +1,6 @@ +# +addFilter("files-duplicate .*/html/pubkey.asc") +addFilter("files-duplicate .*/api/frames.html") +addFilter("files-duplicate .*/api/toc-lxml.html.usedoctest-module.html") +addFilter("description-shorter-than-summary") +addFilter("spurious-executable-perm .*/rest2html.py") \ No newline at end of file diff --git a/python-lxml.changes b/python-lxml.changes index d6064f9..42be466 100644 --- a/python-lxml.changes +++ b/python-lxml.changes @@ -1,3 +1,60 @@ +------------------------------------------------------------------- +Fri Apr 03 08:41:00 CEST 2009 - toms@suse.de + +- Merged changes file with old entries + +------------------------------------------------------------------- +Wed Apr 02 08:58:00 CEST 2009 - toms@suse.de + +- Added rpmlintrc source into SPEC file + +------------------------------------------------------------------- +Tue Mar 31 08:34:00 CEST 2009 - toms@suse.de + +- Fixed SPEC file and added PDF source + +------------------------------------------------------------------- +Wed Mar 23 12:56:00 CEST 2009 - toms@suse.de + +* Updated to 2.2 (excerpt): + See also http://codespeak.net/lxml/changes-2.2.html + + Features added: + - 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. + - Support strings and instantiable Element classes as child + 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 + on serialisation. + + Bugs fixed: + - Memory leak in XPath evaluators. + - Setting the base attribute in lxml.objectify from a unicode + string failed. + - Crash when parsing indented XML in one thread and merging + it with other documents parsed in another thread. + - Crash when parsing an XML Schema with external imports from + a filename. + - iter_links (and related link-rewriting functions) in lxml.html + would interpret CSS like url("link") incorrectly (treating the + quotation marks as part of the link). + - Failing import on systems that have an io module. + - Potential memory leak on exception handling. This was due + 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. + - More robust error handling on serialisation. + - Export lxml.html.parse. + ------------------------------------------------------------------- Wed Sep 18 10:00:00 CEST 2008 - toms@suse.de diff --git a/python-lxml.spec b/python-lxml.spec index 52ffa3f..83db6c9 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,7 +1,7 @@ # -# spec file for package python-lxml (Version 2.1.2) +# spec file for package python-lxml (Version 2.2) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -16,20 +16,22 @@ # -%define modname lxml Name: python-lxml +%define modname lxml +%define docpdf %{modname}doc-2.2.pdf Url: http://codespeak.net/lxml Summary: A Pythonic Binding for the libxml2 and libxslt Libraries -Version: 2.1.2 +Version: 2.2 Release: 1 License: BSD 3-Clause Group: Development/Libraries/Python Source: %{modname}-%{version}.tar.bz2 -Source1: %{modname}doc-%{version}.pdf +Source1: %{docpdf} +Source2: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} -Requires: pyxml libxml2 libxslt +Requires: pyxml BuildRequires: libxslt-devel pyrex python-devel pyxml %description @@ -66,31 +68,82 @@ Authors: % --------------------------------- %prep %setup -q -n %{modname}-%{version} +%{__cp} %{S:1} . %build export CFLAGS="$RPM_OPT_FLAGS" python setup.py build -%{__cp} %{S:1} . %install -python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT \ - --record=INSTALLED_FILES \ - --record-rpm=INSTALLED_FILES-rpm.txt +#%{__install} -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} \ +# $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/examples +python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES +#cat INSTALLED_FILES.tmp | sed s#%{_defaultdocdir}/%{name}##g > INSTALLED_FILES +#%{__cp} -a doc/html $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} +#%{__cp} -a doc/*.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} +#%{__cp} -a doc/*.py $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/examples +#%{__cp} -a benchmark $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/examples +echo "*** $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/rest2html.py" +[ -e $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/rest2html.py ] && \ + %{__chmod} -x $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/rest2html.py %clean rm -rf %{buildroot} -%files -f INSTALLED_FILES-rpm.txt +%files -f INSTALLED_FILES %defattr(-,root,root) %doc CHANGES.txt CREDITS.txt LICENSES.txt README.txt TODO.txt -# Disabled, as it is already in INSTALLED_FILES-rpm.txt: -#%{py_sitedir}/lxml +%{py_sitedir}/lxml %files doc %defattr(-,root,root) -%doc doc/html doc/*.* benchmark %{modname}doc-%{version}.pdf +%doc doc/html doc/*.* benchmark +%doc %{docpdf} +%{_defaultdocdir}/%{name} %changelog +* Fri Apr 03 2009 toms@suse.de +- Merged changes file with old entries +* Thu Apr 02 2009 toms@suse.de +- Added rpmlintrc source into SPEC file +* Tue Mar 31 2009 toms@suse.de +- Fixed SPEC file and added PDF source +* Mon Mar 23 2009 toms@suse.de + * Updated to 2.2 (excerpt): + See also http://codespeak.net/lxml/changes-2.2.html + Features added: + - 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. + - Support strings and instantiable Element classes as child + 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 + on serialisation. + Bugs fixed: + - Memory leak in XPath evaluators. + - Setting the base attribute in lxml.objectify from a unicode + string failed. + - Crash when parsing indented XML in one thread and merging + it with other documents parsed in another thread. + - Crash when parsing an XML Schema with external imports from + a filename. + - iter_links (and related link-rewriting functions) in lxml.html + would interpret CSS like url("link") incorrectly (treating the + quotation marks as part of the link). + - Failing import on systems that have an io module. + - Potential memory leak on exception handling. This was due + 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. + - More robust error handling on serialisation. + - Export lxml.html.parse. * Thu Sep 18 2008 toms@suse.de - Updated to 2.1.2 Features added