rpms/pygsl/devel pygsl.spec,1.13,1.14

[José Abílio Oliveira Matos (jamatos)]

Author: jamatos

Update of /cvs/pkgs/rpms/pygsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3107

Modified Files:
	pygsl.spec 
Log Message:
* Fri Sep 21 2007 José Matos <jamatos[AT]fc.up.pt> - 0.9.1-6
- License clarification.
- Use swig to regenerate the wrappers.
- Rebuild with gsl-1.10.
- Add explicit dependency on gsl version.



Index: pygsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygsl/devel/pygsl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pygsl.spec	30 Aug 2007 08:32:33 -0000	1.13
+++ pygsl.spec	21 Sep 2007 10:03:06 -0000	1.14
@@ -2,11 +2,15 @@
 %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 %define py_incdir %{_includedir}/python%{pyver}
 
+%{expand: %%define gslver %(gsl-config --version)}
+
 Summary:       GNU Scientific Library Interface for python
 Name:          pygsl
 Version:       0.9.1
-Release:       5%{?dist}
-License:       GPLv2
+Release:       6%{?dist}
+# The package is mostly GPL+ but there are two scripts
+# GLPv2+: pygsl/odeiv.py and examples/siman_tsp.py
+License:       GPLv2+
 Group:         Development/Libraries
 
 Url:           http://pygsl.sourceforge.net
@@ -17,7 +21,10 @@
 BuildRequires: numpy
 BuildRequires: gsl-devel
 BuildRequires: python-devel
+# Only need if the generated sources are different from the version used in source
+BuildRequires: swig
 Requires:      numpy
+Requires:      gsl = %{gslver}
 
 %description
 This project provides a python interface for the GNU scientific library (gsl)
@@ -27,7 +34,7 @@
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      python-devel
-Requires:      gsl-devel
+Requires:      gsl-devel = %{gslver}
 
 %description devel
 Development files for pygsl
@@ -37,6 +44,7 @@
 
 %build
 cp %{SOURCE1} .
+rm -f swig_src/gslwrap_wrap.c
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
 
 %install
@@ -58,6 +66,12 @@
 
 
 %changelog
+* Fri Sep 21 2007 José Matos <jamatos[AT]fc.up.pt> - 0.9.1-6
+- License clarification.
+- Use swig to regenerate the wrappers.
+- Rebuild with gsl-1.10.
+- Add explicit dependency on gsl version.
+
 * Thu Aug 30 2007 José Matos <jamatos[AT]fc.up.pt> - 0.9.1-5
 - Fix typo in Requires for subpackage devel.