rpms/SOAPpy/F-8 SOAPpy.spec,1.7,1.8

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30923/F-8

Modified Files:
	SOAPpy.spec 
Log Message:
fix compile (bz #440710)


Index: SOAPpy.spec
===================================================================
RCS file: /cvs/extras/rpms/SOAPpy/F-8/SOAPpy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SOAPpy.spec	9 Dec 2006 04:06:39 -0000	1.7
+++ SOAPpy.spec	23 May 2008 04:13:19 -0000	1.8
@@ -2,11 +2,11 @@
 
 Name:           SOAPpy
 Version:        0.11.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Full-featured SOAP library for Python
 
 Group:          Development/Languages
-License:        Python Software Foundation License
+License:        Python
 URL:            http://pywebsvcs.sourceforge.net
 Source0:        http://dl.sourceforge.net/pywebsvcs/%{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}-python25.patch
@@ -19,9 +19,6 @@
 Requires:       python-fpconst >= 0.6.0
 Requires:       PyXML >= 0.8.3
 
-Obsoletes:      python-SOAPpy = %{version}
-Provides:       python-SOAPpy = %{version}-%{release}
-
 %description
 The goal of the SOAPpy team is to provide a full-featured SOAP library
 for Python that is very simple to use and that fully supports dynamic
@@ -44,43 +41,42 @@
 # remove executable flag from example scripts
 chmod -x bid/* contrib/* docs/* tools/* validate/*
 
+# fix file encodings
+iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
+
 
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %install
-rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 
 %check
 # testTime is meant to pass, testArray is a known failure.
 # ERROR: testTime (__main__.SOAPTestCase)
 # FAIL: testArray (__main__.SOAPTestCase)
-PYTHONPATH="%{buildroot}%{python_sitelib}" %{__python} tests/SOAPtest.py || :
+PYTHONPATH="$RPM_BUILD_ROOT%{python_sitelib}" %{__python} tests/SOAPtest.py || :
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE README RELEASE_INFO TODO docs/ contrib/ validate/ bid/ tools/
-
-%dir %{python_sitelib}/%{name}
-%{python_sitelib}/%{name}/*.py
-%{python_sitelib}/%{name}/*.pyc
-%{python_sitelib}/%{name}/*.pyo
-
-%dir %{python_sitelib}/%{name}/wstools
-%{python_sitelib}/%{name}/wstools/*.py
-%{python_sitelib}/%{name}/wstools/*.pyc
-%{python_sitelib}/%{name}/wstools/*.pyo
+%{python_sitelib}/%{name}*
 
 
 %changelog
+* Thu May 22 2008 Christopher Stone <chris.stone at gmail.com> 0.11.6-7
+- Simplify %%files
+- Remove no longer needed Obsoletes/Provides
+- Update %%license tag
+
 * 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