X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpython-lxml.git;a=blobdiff_plain;f=python-lxml.spec;h=c65325d42bcde477e96618039c5b8a819bb00fe0;hp=9d5caaa7daf80180b0710a7109694f7d108efef3;hb=17832906cc9efa4feba95e35324d5e578794880b;hpb=ea280a0fd72e98911da2ade4ca5404793f97aeb2

diff --git a/python-lxml.spec b/python-lxml.spec
index 9d5caaa..c65325d 100644
--- a/python-lxml.spec
+++ b/python-lxml.spec
@@ -1,33 +1,33 @@
 #
-%bcond_without	python3
-%bcond_without	python2
+# Conditional build:
+%bcond_without	apidocs		# do not build and package API docs
+%bcond_without	python2		# Python 2 package
+%bcond_without	python3		# Python 3 package
+
 %define		module	lxml
-#
-Summary:	A Pythonic binding for the libxml2 and libxslt libraries
-Summary(pl.UTF-8):	Pythonowe wiązanie do bibliotek libxml2 i libxslt
+Summary:	Python 2 binding for the libxml2 and libxslt libraries
+Summary(pl.UTF-8):	Wiązanie Pythona 2 do bibliotek libxml2 i libxslt
 Name:		python-%{module}
-Version:	2.2.6
-Release:	2
+Version:	3.4.4
+Release:	1
 License:	BSD
 Group:		Libraries/Python
-Source0:	http://codespeak.net/lxml/%{module}-%{version}.tgz
-# Source0-md5:	b1f700fb22d7ee9b977ee3eceb65b20c
-Patch0:		python3.patch
-URL:		http://codespeak.net/lxml/
-BuildRequires:	libxml2-devel
-BuildRequires:	libxslt-devel
+Source0:	http://lxml.de/files/%{module}-%{version}.tgz
+# Source0-md5:	a9a65972afc173ec7a39c585f4eea69c
+URL:		http://lxml.de/
+BuildRequires:	libxml2-devel >= 1:2.7.8
+BuildRequires:	libxslt-devel >= 1.1.26
 %if %{with python2}
-BuildRequires:	python-devel
-BuildRequires:	python-modules
+BuildRequires:	python-devel >= 1:2.6
+BuildRequires:	python-modules >= 1:2.6
 %endif
 %if %{with python3}
-BuildRequires:	python3-Cython
-BuildRequires:	python3-devel
-BuildRequires:	python3-modules
+BuildRequires:	python3-Cython > 0.17
+BuildRequires:	python3-devel >= 1:3.2
+BuildRequires:	python3-modules >= 1:3.2
 %endif
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
-BuildRequires:	unzip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,11 +36,9 @@ lxml is a Pythonic binding for the libxml2 and libxslt libraries.
 %description -l pl.UTF-8
 lxml to pythonowe wiązanie do bibliotek libxml2 i libxslt.
 
-%package -n	python3-%{module}
-Summary:	A Pythonic binding for the libxml2 and libxslt libraries
-Summary(pl.UTF-8):	Pythonowe wiązanie do bibliotek libxml2 i libxslt
-Version:	%{version}
-Release:	%{release}
+%package -n python3-%{module}
+Summary:	Python 3 binding for the libxml2 and libxslt libraries
+Summary(pl.UTF-8):	Wiązanie Pythona 3 do bibliotek libxml2 i libxslt
 Group:		Libraries/Python
 
 %description -n python3-%{module}
@@ -49,9 +47,22 @@ lxml is a Pythonic binding for the libxml2 and libxslt libraries.
 %description -n python3-%{module} -l pl.UTF-8
 lxml to pythonowe wiązanie do bibliotek libxml2 i libxslt.
 
+%package apidocs
+Summary:	lxml API documentation
+Summary(pl.UTF-8):	Dokumentacja API modułu lxml
+Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description apidocs
+lxml API documentation.
+
+%description apidocs -l pl.UT8-8
+Dokumentacja API modułu lxml.
+
 %prep
 %setup -q -n %{module}-%{version}
-%patch0 -p1
 
 %build
 %if %{with python2}
@@ -78,19 +89,30 @@ rm -rf $RPM_BUILD_ROOT
 	install \
 	--root=$RPM_BUILD_ROOT \
 	--optimize=2
-
-%py3_postclean
 %endif
 
+# cleanup for packaging
+rm -rf docs
+cp -a doc docs
+# apidocs packaged separately
+rm -rf docs/html
+# build docs not useful at runtime
+rm docs/build.txt
+# common licenses
+rm docs/licenses/{BSD,GPL}.txt
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc doc/* CHANGES.txt CREDITS.txt TODO.txt
+%doc docs/* CHANGES.txt CREDITS.txt LICENSES.txt README.rst TODO.txt
 %dir %{py_sitedir}/lxml
 %{py_sitedir}/lxml/*.py[co]
+%{py_sitedir}/lxml/lxml.etree*.h
+%{py_sitedir}/lxml/includes
+%{py_sitedir}/lxml/isoschematron
 %dir %{py_sitedir}/lxml/html
 %{py_sitedir}/lxml/html/*.py[co]
 %attr(755,root,root) %{py_sitedir}/lxml/etree.so
@@ -101,12 +123,21 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
-%doc doc/* CHANGES.txt CREDITS.txt TODO.txt
+%doc docs/* CHANGES.txt CREDITS.txt LICENSES.txt README.rst 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/etree.cpython-*.so
+%attr(755,root,root) %{py3_sitedir}/lxml/objectify.cpython-*.so
+%{py3_sitedir}/lxml/*.py
+%{py3_sitedir}/lxml/__pycache__
+%{py3_sitedir}/lxml/lxml.etree*.h
+%{py3_sitedir}/lxml/includes
+%{py3_sitedir}/lxml/isoschematron
+%{py3_sitedir}/lxml/html
 %{py3_sitedir}/lxml-*.egg-info
 %endif
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/html/*
+%endif