From bef308a393d2a31cbd7e5faacfc584fa43fd30d3eb9b7ec4b62d64412c523aed Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 5 Jun 2009 22:28:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-lxml?expand=0&rev=12 --- lxml-2.2.1.tar.bz2 | 3 +++ lxml-2.2.tar.bz2 | 3 --- lxmldoc-2.2.1.pdf | 3 +++ lxmldoc-2.2.pdf | 3 --- python-lxml-rpmlintrc | 7 ++---- python-lxml.changes | 18 ++++++++++++++ python-lxml.spec | 56 ++++++++++++++++++++++++------------------- 7 files changed, 58 insertions(+), 35 deletions(-) create mode 100644 lxml-2.2.1.tar.bz2 delete mode 100644 lxml-2.2.tar.bz2 create mode 100644 lxmldoc-2.2.1.pdf delete mode 100644 lxmldoc-2.2.pdf diff --git a/lxml-2.2.1.tar.bz2 b/lxml-2.2.1.tar.bz2 new file mode 100644 index 0000000..e22087d --- /dev/null +++ b/lxml-2.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5142ba4e44844deb08a26fd3ef05cb9980b159443f78db3d841c659339edaf0 +size 2033284 diff --git a/lxml-2.2.tar.bz2 b/lxml-2.2.tar.bz2 deleted file mode 100644 index ae96a58..0000000 --- a/lxml-2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5261f5f30679615b6babcc645ad3c6b38476bc5a300c37e53f840327e5d6fcd0 -size 2020417 diff --git a/lxmldoc-2.2.1.pdf b/lxmldoc-2.2.1.pdf new file mode 100644 index 0000000..0cf5815 --- /dev/null +++ b/lxmldoc-2.2.1.pdf @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index d5f3258..0000000 --- a/lxmldoc-2.2.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5eeadb645a9a45f68f6c2d13aeccd9e7b14e0c5ce289f921147c3b55a701237c -size 1867462 diff --git a/python-lxml-rpmlintrc b/python-lxml-rpmlintrc index 79a23a9..f35b18a 100644 --- a/python-lxml-rpmlintrc +++ b/python-lxml-rpmlintrc @@ -1,6 +1,3 @@ # -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 +addFilter("files-duplicate .*/toc-lxml.html.usedoctest-module.html") +addFilter("files-duplicate .*/html/api/frames.html") \ No newline at end of file diff --git a/python-lxml.changes b/python-lxml.changes index 42be466..db245e5 100644 --- a/python-lxml.changes +++ b/python-lxml.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jun 03 10:47:00 CEST 2009 - toms@suse.de + +- Updated to 2.2.1: + Features added: + * Injecting default attributes into a document during XML Schema + validation (also at parse time). + * Pass huge_tree parser option to disable parser security restrictions + imposed by libxml2 2.7. + + Bugs fixed + * The script for statically building libxml2 and libxslt didn't work in Py3. + * XMLSchema() also passes invalid schema documents on to libxml2 for + parsing (which could lead to a crash before release 2.6.24). + +Full list: http://codespeak.net/lxml/changes-2.2.1.html + + ------------------------------------------------------------------- Fri Apr 03 08:41:00 CEST 2009 - toms@suse.de diff --git a/python-lxml.spec b/python-lxml.spec index 83db6c9..9b10825 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,5 +1,5 @@ # -# spec file for package python-lxml (Version 2.2) +# spec file for package python-lxml (Version 2.2.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,22 +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.2 +Version: 2.2.1 Release: 1 License: BSD 3-Clause Group: Development/Libraries/Python Source: %{modname}-%{version}.tar.bz2 -Source1: %{docpdf} +Source1: %{modname}doc-%{version}.pdf Source2: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} Requires: pyxml +# Requires: libxml2 libxslt BuildRequires: libxslt-devel pyrex python-devel pyxml %description @@ -68,40 +68,48 @@ Authors: % --------------------------------- %prep %setup -q -n %{modname}-%{version} -%{__cp} %{S:1} . %build export CFLAGS="$RPM_OPT_FLAGS" -python setup.py build +%{__python} setup.py build +%{__cp} %{S:1} . %install -#%{__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 +%{__python} setup.py install \ + --prefix=%{_prefix} \ + --root=$RPM_BUILD_ROOT \ + --record-rpm=INSTALLED_FILES.txt +# Avoid warnings from rpmlint: +[ -e doc/rest2html.py ] && %{__mkdir} doc/examples && %{__mv} doc/rest2html.py doc/examples/ +# Remove any duplicate files: +for i in doc/html/pubkey.asc ; do + [ -e "$i" ] && %{__rm} "$i" +done %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} -%files -f INSTALLED_FILES +%files -f INSTALLED_FILES.txt %defattr(-,root,root) %doc CHANGES.txt CREDITS.txt LICENSES.txt README.txt TODO.txt -%{py_sitedir}/lxml %files doc %defattr(-,root,root) -%doc doc/html doc/*.* benchmark -%doc %{docpdf} -%{_defaultdocdir}/%{name} +%doc doc/html doc/examples doc/*.* benchmark %{modname}doc-%{version}.pdf %changelog +* Wed Jun 03 2009 toms@suse.de +- Updated to 2.2.1: + Features added: + * Injecting default attributes into a document during XML Schema + validation (also at parse time). + * Pass huge_tree parser option to disable parser security restrictions + imposed by libxml2 2.7. + Bugs fixed + * The script for statically building libxml2 and libxslt didn't work in Py3. + * XMLSchema() also passes invalid schema documents on to libxml2 for + parsing (which could lead to a crash before release 2.6.24). + Full list: http://codespeak.net/lxml/changes-2.2.1.html * Fri Apr 03 2009 toms@suse.de - Merged changes file with old entries * Thu Apr 02 2009 toms@suse.de