From 9fb8e6c6fe76de44c6670cb931429df36bae96b51c096dbafe841d9f6eeb4de9 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 8 Mar 2011 09:39:28 +0000 Subject: [PATCH 1/5] Updating link to change in openSUSE:Factory/python-lxml revision 26.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-lxml?expand=0&rev=960943d331d5a9baae6001cdb8256da9 --- python-lxml.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-lxml.spec b/python-lxml.spec index b9ee0a0..79dd294 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,5 +1,5 @@ # -# spec file for package python-lxml (Version 2.2.8) +# spec file for package python-lxml # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: python-lxml Version: 2.3 -Release: 2 +Release: 1 License: BSD3c Summary: A Pythonic Binding for the libxml2 and libxslt Libraries Url: http://codespeak.net/lxml From 588a0cafd2c18b6efb722eddc5392be5827c27e528b3e8f8e719cadba987967a Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 31 Aug 2011 07:22:38 +0000 Subject: [PATCH 2/5] Accepting request 80257 from home:aturrini:branches:devel:languages:python Fixed typo in description of python-lxml.spec OBS-URL: https://build.opensuse.org/request/show/80257 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-lxml?expand=0&rev=32 --- python-lxml.changes | 5 +++++ python-lxml.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-lxml.changes b/python-lxml.changes index 7035499..bf4281e 100644 --- a/python-lxml.changes +++ b/python-lxml.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 30 18:40:26 UTC 2011 - andrea.turrini@gmail.com + +- Fixed typo in description of python-lxml.spec + ------------------------------------------------------------------- Thu Mar 3 08:37:49 UTC 2011 - saschpe@suse.de diff --git a/python-lxml.spec b/python-lxml.spec index 79dd294..fa70494 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -51,8 +51,8 @@ the native libxml2 tree. It also extends this API to expose libxml2 and libxslt specific functionality, such as XPath, Relax NG, XML Schema, XSLT, and c14n. -Author: -------- +Authors: +-------- Stefan Behnel - main developer and maintainer Martijn Faassen - creator of lxml and initial main developer and others From 28bec3bf6335b1311e0eec8cfab389f323379ff706e77aa7c6d92b651a4f07c5 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 2 Sep 2011 11:25:24 +0000 Subject: [PATCH 3/5] - Build against Cython instead of pyrex - Don't repackage source tarball - Remove unneeded rpmlint filters OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-lxml?expand=0&rev=33 --- lxml-2.3.tar.bz2 | 3 -- lxml-2.3.tar.gz | 3 ++ python-lxml-rpmlintrc | 13 ------ python-lxml.changes | 7 +++ python-lxml.spec | 101 ++++++++++++++++-------------------------- 5 files changed, 47 insertions(+), 80 deletions(-) delete mode 100644 lxml-2.3.tar.bz2 create mode 100644 lxml-2.3.tar.gz delete mode 100644 python-lxml-rpmlintrc diff --git a/lxml-2.3.tar.bz2 b/lxml-2.3.tar.bz2 deleted file mode 100644 index a84af20..0000000 --- a/lxml-2.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db726624c5763f7d5d173fec309666fe25c1aa3b21b1b25481e5ea331a195d92 -size 2232964 diff --git a/lxml-2.3.tar.gz b/lxml-2.3.tar.gz new file mode 100644 index 0000000..8c028c8 --- /dev/null +++ b/lxml-2.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eea1b8d29532739c1383cb4794c5eacd6176f0972b59e8d29348335b87ff2e66 +size 3187747 diff --git a/python-lxml-rpmlintrc b/python-lxml-rpmlintrc deleted file mode 100644 index 0d93e60..0000000 --- a/python-lxml-rpmlintrc +++ /dev/null @@ -1,13 +0,0 @@ -# -addFilter("files-duplicate .*/toc-lxml.html.usedoctest-module.html") -addFilter("files-duplicate .*/html/api/frames.html") -# Fix false positives: -addFilter("files-duplicate .*/lxml/html/.*") -addFilter("files-duplicate .*/lxml/sax.py?") -addFilter("files-duplicate .*/lxml/usedoctest.py?") -addFilter("files-duplicate .*/lxml/pyclasslookup.py?") -addFilter("files-duplicate .*/lxml/ElementInclude.py?") -addFilter("files-duplicate .*/lxml/__init__.py?") -addFilter("files-duplicate .*/lxml/_elementpath.py?") -addFilter("files-duplicate .*/lxml/doctestcompare.py?") - diff --git a/python-lxml.changes b/python-lxml.changes index bf4281e..405c9fa 100644 --- a/python-lxml.changes +++ b/python-lxml.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 2 11:06:52 UTC 2011 - saschpe@suse.de + +- Build against Cython instead of pyrex +- Don't repackage source tarball +- Remove unneeded rpmlint filters + ------------------------------------------------------------------- Tue Aug 30 18:40:26 UTC 2011 - andrea.turrini@gmail.com diff --git a/python-lxml.spec b/python-lxml.spec index fa70494..061cc1f 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -11,91 +11,64 @@ # 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/ # - -%define modname lxml - Name: python-lxml Version: 2.3 -Release: 1 -License: BSD3c -Summary: A Pythonic Binding for the libxml2 and libxslt Libraries -Url: http://codespeak.net/lxml -Group: Development/Libraries/Python -Source: %{modname}-%{version}.tar.bz2 -Source1: %{modname}doc-%{version}.pdf -Source2: %{name}-rpmlintrc -# Requires: libxml2 libxslt -BuildRequires: libxslt-devel -BuildRequires: pyrex -BuildRequires: python-devel +Release: 0 +Url: http://lxml.de/ +Summary: Powerful and Pythonic XML processing library +License: BSD-3-Clause +Group: Development/Languages/Python +Source: http://pypi.python.org/packages/source/l/lxml/lxml-%{version}.tar.gz +Source1: lxmldoc-%{version}.pdf BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{py_requires} -# 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 - -# +BuildRequires: python-devel +BuildRequires: libxslt-devel +BuildRequires: python-Cython +%if 0%{?suse_version} +%py_requires +%endif +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %description -lxml is a Pythonic binding for the libxml2 and libxslt libraries. It -follows the ElementTree API as much as possible, building it on top of -the native libxml2 tree. It also extends this API to expose libxml2 and -libxslt specific functionality, such as XPath, Relax NG, XML Schema, -XSLT, and c14n. - -Authors: --------- - Stefan Behnel - main developer and maintainer - Martijn Faassen - creator of lxml and initial main developer - and others +lxml is a Pythonic, mature binding for the libxml2 and libxslt libraries. It +provides safe and convenient access to these libraries using the ElementTree +API. It extends the ElementTree API significantly to offer support for XPath, +RelaxNG, XML Schema, XSLT, C14N and much more. %package doc -License: BSD3c -Summary: Documentation for %{name} +Summary: Powerful and Pythonic XML processing library - Documentation Group: Development/Libraries/Python %description doc -Documentation for %{modname} (HTML and PDF). +lxml is a Pythonic, mature binding for the libxml2 and libxslt libraries. It +provides safe and convenient access to these libraries using the ElementTree +API. It extends the ElementTree API significantly to offer support for XPath, +RelaxNG, XML Schema, XSLT, C14N and much more. + +This package contains documentation for lxml (HTML and PDF). -# --------------------------------- %prep -%setup -q -n %{modname}-%{version} +%setup -q -n lxml-%{version} %build -export CFLAGS="%{optflags}" -%{__python} setup.py build -%{__cp} %{S:1} . +CFLAGS="%{optflags}" python setup.py build %install -%{__python} setup.py install \ - --optimize 1 \ - --prefix=%{_prefix} \ - --root=%{buildroot} \ - --record-rpm=INSTALLED_FILES.txt - -[ -e doc/rest2html.py ] && %{__mkdir} doc/examples && %{__mv} doc/rest2html.py doc/examples/ - -for i in doc/html/pubkey.asc ; do - [ -e "$i" ] && %{__rm} "$i" -done - -%clean -%{__rm} -rf %{buildroot} - -%files -f INSTALLED_FILES.txt -%defattr(-,root,root) -%doc CHANGES.txt CREDITS.txt LICENSES.txt README.txt TODO.txt +python setup.py install --prefix=%{_prefix} --root=%{buildroot} +install -Dm0644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}-doc/lxml-%{version}.pdf # Install PDF into docdir %files doc %defattr(-,root,root) -%doc doc/html doc/examples doc/*.* benchmark %{modname}doc-%{version}.pdf +%doc doc/html +%{_docdir}/%{name}-doc/lxml-%{version}.pdf + +%files +%defattr(-,root,root,-) +%doc CHANGES.txt CREDITS.txt IDEAS.txt LICENSES.txt README.txt TODO.txt +%{python_sitearch}/* %changelog From 509c19ed0f87273575803055e340172818cfb7065f6d4bf780322b08cf5986c0 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 2 Sep 2011 12:10:18 +0000 Subject: [PATCH 4/5] - Simpler PDF install OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-lxml?expand=0&rev=34 --- python-lxml.changes | 5 +++++ python-lxml.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/python-lxml.changes b/python-lxml.changes index 405c9fa..2f904a8 100644 --- a/python-lxml.changes +++ b/python-lxml.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 2 12:08:59 UTC 2011 - saschpe@suse.de + +- Simpler PDF install + ------------------------------------------------------------------- Fri Sep 2 11:06:52 UTC 2011 - saschpe@suse.de diff --git a/python-lxml.spec b/python-lxml.spec index 061cc1f..b2ef1c2 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -53,18 +53,17 @@ This package contains documentation for lxml (HTML and PDF). %prep %setup -q -n lxml-%{version} +cp %{SOURCE1} . %build CFLAGS="%{optflags}" python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -install -Dm0644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}-doc/lxml-%{version}.pdf # Install PDF into docdir %files doc %defattr(-,root,root) -%doc doc/html -%{_docdir}/%{name}-doc/lxml-%{version}.pdf +%doc doc/html lxmldoc-%{version}.pdf %files %defattr(-,root,root,-) From e42facd28f268565490ba60a2a56eda602609cdcfa604e36f52dbbddfb798c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sat, 3 Sep 2011 19:00:29 +0000 Subject: [PATCH 5/5] Accepting request 80719 from home:babelworx:ldig:branches:devel:languages:python license update: BSD-3-Clause and GPL-2.0+ See LICENSES.TXT - test.py is GPL licensed (aggregation) OBS-URL: https://build.opensuse.org/request/show/80719 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-lxml?expand=0&rev=35 --- python-lxml.changes | 6 ++++++ python-lxml.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/python-lxml.changes b/python-lxml.changes index 2f904a8..7219f2b 100644 --- a/python-lxml.changes +++ b/python-lxml.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 17:36:33 UTC 2011 - cfarrell@suse.com + +- license update: BSD-3-Clause and GPL-2.0+ + See LICENSES.TXT - test.py is GPL licensed (aggregation) + ------------------------------------------------------------------- Fri Sep 2 12:08:59 UTC 2011 - saschpe@suse.de diff --git a/python-lxml.spec b/python-lxml.spec index b2ef1c2..9e4d568 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -20,7 +20,7 @@ Version: 2.3 Release: 0 Url: http://lxml.de/ Summary: Powerful and Pythonic XML processing library -License: BSD-3-Clause +License: BSD-3-Clause and GPL-2.0+ Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/l/lxml/lxml-%{version}.tar.gz Source1: lxmldoc-%{version}.pdf