X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpython-lxml.git;a=blobdiff_plain;f=python-lxml.spec;h=a60ae27f1769a485fb9bd0f11ea5a4abb82ad7f6;hp=e76f0af6d40b159d8e770252f8647b4229839c60;hb=00a14e7;hpb=9295daeb913fdb3e403db3698ae04877ed058f1d

diff --git a/python-lxml.spec b/python-lxml.spec
index e76f0af..a60ae27 100644
--- a/python-lxml.spec
+++ b/python-lxml.spec
@@ -1,34 +1,33 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# do not build and package API docs
-%bcond_without	python3		# Python 3 package
 %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.7
-Release:	2
+Version:	4.1.1
+Release:	1
 License:	BSD
 Group:		Libraries/Python
-Source0:	http://codespeak.net/lxml/%{module}-%{version}.tgz
-# Source0-md5:	c1da56b823fdc00804938d2b788dbfd0
-Patch0:		python3.patch
-URL:		http://codespeak.net/lxml/
-BuildRequires:	libxml2-devel
-BuildRequires:	libxslt-devel
+Source0:	http://lxml.de/files/%{module}-%{version}.tgz
+# Source0-md5:	0265ad6701951347f2dbbb470e3d1512
+URL:		http://lxml.de/
+BuildRequires:	libxml2-devel >= 1:2.9.2
+BuildRequires:	libxslt-devel >= 1.1.28
 %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:	rpmbuild(macros) >= 1.710
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,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}
@@ -52,43 +49,40 @@ lxml to pythonowe wiązanie do bibliotek libxml2 i libxslt.
 
 %package apidocs
 Summary:	lxml API documentation
-Summary(pl.UTF-8):	Dokumentacja API biblioteki lxml
+Summary(pl.UTF-8):	Dokumentacja API modułu lxml
 Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
-API and internal documentation for lxml library.
+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}
-%{__python} setup.py build
+%py_build
 %endif
 %if %{with python3}
-%{__python3} setup.py build
+%py3_build
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with python2}
-%{__python} setup.py \
-	install \
-	--root=$RPM_BUILD_ROOT \
-	--optimize=2
+%py_install
 
 %py_postclean
 %endif
 
 %if %{with python3}
-%{__python3} setup.py \
-	install \
-	--root=$RPM_BUILD_ROOT \
-	--optimize=2
-
-%py3_postclean
+%py3_install
 %endif
 
 # cleanup for packaging
@@ -107,27 +101,45 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc docs/* 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]
-%dir %{py_sitedir}/lxml/html
-%{py_sitedir}/lxml/html/*.py[co]
+%{py_sitedir}/lxml/etree*.h
+%{py_sitedir}/lxml/lxml.etree*.h
+%{py_sitedir}/lxml/includes
+%{py_sitedir}/lxml/isoschematron
+%attr(755,root,root) %{py_sitedir}/lxml/_elementpath.so
+%attr(755,root,root) %{py_sitedir}/lxml/builder.so
 %attr(755,root,root) %{py_sitedir}/lxml/etree.so
 %attr(755,root,root) %{py_sitedir}/lxml/objectify.so
-%{py_sitedir}/lxml-*.egg-info
+%dir %{py_sitedir}/lxml/html
+%{py_sitedir}/lxml/html/*.py[co]
+%attr(755,root,root) %{py_sitedir}/lxml/html/clean.so
+%attr(755,root,root) %{py_sitedir}/lxml/html/diff.so
+%{py_sitedir}/lxml-%{version}-py*.egg-info
 %endif
 
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
-%doc docs/* 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]
+%attr(755,root,root) %{py3_sitedir}/lxml/_elementpath.cpython-*.so
+%attr(755,root,root) %{py3_sitedir}/lxml/builder.cpython-*.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/etree*.h
+%{py3_sitedir}/lxml/lxml.etree*.h
+%{py3_sitedir}/lxml/includes
+%{py3_sitedir}/lxml/isoschematron
 %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
-%{py3_sitedir}/lxml-*.egg-info
+%{py3_sitedir}/lxml/html/*.py
+%{py3_sitedir}/lxml/html/__pycache__
+%attr(755,root,root) %{py3_sitedir}/lxml/html/clean.cpython-*.so
+%attr(755,root,root) %{py3_sitedir}/lxml/html/diff.cpython-*.so
+%{py3_sitedir}/lxml-%{version}-py*.egg-info
 %endif
 
 %if %{with apidocs}