OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-lxml?expand=0&rev=12

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