[SOAPpy] Apply changes from Toshio on BZRH #602932

[Pierre-YvesChibon]

commit f14861112a0a44b54070fe06162128f30898c71b
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Sat Jul 2 14:22:33 2011 +0200

    Apply changes from Toshio on BZRH #602932
    
    - Add m2crypto as R
    - Change License
    - Update spec

 SOAPpy.spec |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/SOAPpy.spec b/SOAPpy.spec
index dfeb8ec..c60c2d9 100644
--- a/SOAPpy.spec
+++ b/SOAPpy.spec
@@ -1,14 +1,22 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if !(0%{?rhel} > 6 || 0%{?fedora} >= 13)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%endif
 
 Name:           SOAPpy
 Version:        0.11.6
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Full-featured SOAP library for Python
 
 Group:          Development/Languages
-License:        Python
+# The entire source is licensed under the 3 clause BSD except for the following
+# files which are under the ZPLv2.0:
+# SOAPpy/wstools/Utility.py
+# SOAPpy/wstools/XMLSchema.py
+# SOAPpy/wstools/WSDLTools.py
+License:        BSD and ZPLv2.0
 URL:            http://pywebsvcs.sourceforge.net
-Source0:        http://dl.sourceforge.net/pywebsvcs/%{name}-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/pywebsvcs/SOAP.py/%{version}/%{name}-%{version}.tar.gz
+# from __future__ imports need to be at the beginning of files
 Patch0:         %{name}-%{version}-python25.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,6 +26,7 @@ BuildRequires:  python-devel
 BuildRequires:  python-fpconst >= 0.6.0
 Requires:       python-fpconst >= 0.6.0
 Requires:       PyXML >= 0.8.3
+Requires:       m2crypto
 
 %description
 The goal of the SOAPpy team is to provide a full-featured SOAP library
@@ -51,8 +60,7 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 %check
 # testTime is meant to pass, testArray is a known failure.
@@ -72,6 +80,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 01 2011 Pierre-Yves Chibon <pingou at pingoured.fr> - 0.11.6-12
+- Add m2crypto as R
+- Change License
+- Update spec
+-   All these changes comes from Toshio's patch BZRH #602932
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.11.6-11
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild