rpms/SOAPpy/devel SOAPpy-0.11.6-python25.patch, NONE, 1.1 SOAPpy.spec, 1.6, 1.7

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18405

Modified Files:
	SOAPpy.spec 
Added Files:
	SOAPpy-0.11.6-python25.patch 
Log Message:
python 2.5 patches

SOAPpy-0.11.6-python25.patch:

--- NEW FILE SOAPpy-0.11.6-python25.patch ---
--- SOAPpy/Client.py~	2006-12-08 19:01:59.000000000 -0800
+++ SOAPpy/Client.py	2006-12-08 19:02:23.000000000 -0800
@@ -1,3 +1,5 @@
+from __future__ import nested_scopes
+
 """
 ################################################################################
 #
@@ -43,8 +45,6 @@
 ident = '$Id: Client.py,v 1.20 2004/04/10 04:22:52 irjudson Exp $'
 from version import __version__
 
-from __future__ import nested_scopes
-
 #import xml.sax
 import urllib
 from types import *
--- SOAPpy/GSIServer.py~	2006-12-08 19:13:42.000000000 -0800
+++ SOAPpy/GSIServer.py	2006-12-08 19:13:56.000000000 -0800
@@ -1,3 +1,5 @@
+from __future__ import nested_scopes
+
 """
 GSIServer - Contributed by Ivan R. Judson <judson at mcs.anl.gov>
 
@@ -46,8 +48,6 @@
 ident = '$Id: GSIServer.py,v 1.4 2004/02/04 03:21:02 irjudson Exp $'
 from version import __version__
 
-from __future__ import nested_scopes
-
 #import xml.sax
 import re
 import socket
--- SOAPpy/NS.py~	2006-12-08 19:14:02.000000000 -0800
+++ SOAPpy/NS.py	2006-12-08 19:14:15.000000000 -0800
@@ -1,3 +1,5 @@
+from __future__ import nested_scopes
+
 """
 ################################################################################
 #
@@ -40,8 +42,6 @@
 ################################################################################
 """
 
-from __future__ import nested_scopes
-
 ident = '$Id: NS.py,v 1.3 2004/01/31 04:20:05 warnes Exp $'
 from version import __version__
 
--- SOAPpy/Server.py~	2006-12-08 19:14:20.000000000 -0800
+++ SOAPpy/Server.py	2006-12-08 19:14:33.000000000 -0800
@@ -1,3 +1,5 @@
+from __future__ import nested_scopes
+
 """
 ################################################################################
 #
@@ -43,8 +45,6 @@
 ident = '$Id: Server.py,v 1.20 2004/04/28 21:47:10 warnes Exp $'
 from version import __version__
 
-from __future__ import nested_scopes
-
 #import xml.sax
 import re
 import socket
--- SOAPpy/Types.py~	2006-12-08 19:14:39.000000000 -0800
+++ SOAPpy/Types.py	2006-12-08 19:14:52.000000000 -0800
@@ -1,3 +1,5 @@
+from __future__ import nested_scopes
+
 """
 ################################################################################
 # Copyright (c) 2003, Pfizer
@@ -36,8 +38,6 @@
 ident = '$Id: Types.py,v 1.17 2004/09/11 03:03:33 warnes Exp $'
 from version import __version__
 
-from __future__ import nested_scopes
-
 import UserList
 import base64
 import cgi


Index: SOAPpy.spec
===================================================================
RCS file: /cvs/extras/rpms/SOAPpy/devel/SOAPpy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SOAPpy.spec	9 Dec 2006 01:39:36 -0000	1.6
+++ SOAPpy.spec	9 Dec 2006 04:06:39 -0000	1.7
@@ -2,18 +2,24 @@
 
 Name:           SOAPpy
 Version:        0.11.6
-Release:        5%{?dist}.2
+Release:        6%{?dist}
 Summary:        Full-featured SOAP library for Python
+
 Group:          Development/Languages
 License:        Python Software Foundation License
 URL:            http://pywebsvcs.sourceforge.net
 Source0:        http://dl.sourceforge.net/pywebsvcs/%{name}-%{version}.tar.gz
+Patch0:         %{name}-%{version}-python25.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+
+BuildRequires:  python-devel
 BuildRequires:  python-fpconst >= 0.6.0
 Requires:       python-fpconst >= 0.6.0
 Requires:       PyXML >= 0.8.3
-Obsoletes:      python-SOAPpy
+
+Obsoletes:      python-SOAPpy = %{version}
 Provides:       python-SOAPpy = %{version}-%{release}
 
 %description
@@ -24,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .python25
 
 # remove shell bangs
 pushd %{name}/wstools
@@ -74,11 +81,11 @@
 
 
 %changelog
-* Fri Dec 08 2006 Christopher Stone <chris.stone at gmail.com> 0.11.6-5.fc7.2
-- Bump again for python-fpconst rebuild
-
-* Fri Dec 08 2006 Christopher Stone <chris.stone at gmail.com> 0.11.6-5.fc7.1
-- python(abi) = 0:2.5
+* Fri Dec 08 2006 Christopher Stone <chris.stone at gmail.com> 0.11.6-6
+- Readd python-devel to BR
+- Add patch to build with python 2.5
+- Add versioned Obsoletes
+- python(abi) = 0:2.5 rebuild
 
 * Wed Sep 06 2006 Christopher Stone <chris.stone at gmail.com> 0.11.6-5
 - No longer %%ghost pyo files bug #205436