rpms/pygsl/devel pygsl-0.9.4-removed-gsm-units.patch, NONE, 1.1 pygsl.spec, 1.24, 1.25

[José Abílio Oliveira Matos]

Author: jamatos

Update of /cvs/pkgs/rpms/pygsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20892

Modified Files:
	pygsl.spec 
Added Files:
	pygsl-0.9.4-removed-gsm-units.patch 
Log Message:
* Tue Sep 15 2009 José Matos <jamatos at fc.up.pt> - 0.9.4-4
- Remove gsm units taken away in gsl-1.13.


pygsl-0.9.4-removed-gsm-units.patch:
 const_cgs_array.c  |   16 ++++++++--------
 const_cgsm_array.c |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE pygsl-0.9.4-removed-gsm-units.patch ---
diff -ur pygsl-0.9.4.orig/src/const_cgs_array.c pygsl-0.9.4/src/const_cgs_array.c
--- pygsl-0.9.4.orig/src/const_cgs_array.c	2005-04-27 08:53:37.000000000 +0100
+++ pygsl-0.9.4/src/const_cgs_array.c	2009-09-15 18:26:29.000000000 +0100
@@ -14,10 +14,10 @@
 {"mass_neutron",GSL_CONST_CGS_MASS_NEUTRON,"g"},
 {"rydberg",GSL_CONST_CGS_RYDBERG,"g cm^2 / s^2"},
 {"boltzmann",GSL_CONST_CGS_BOLTZMANN,"g cm^2 / K s^2"},
-{"bohr_magneton",GSL_CONST_CGS_BOHR_MAGNETON,"A cm^2"},
-{"nuclear_magneton",GSL_CONST_CGS_NUCLEAR_MAGNETON,"A cm^2"},
-{"electron_magnetic_moment",GSL_CONST_CGS_ELECTRON_MAGNETIC_MOMENT,"A cm^2"},
-{"proton_magnetic_moment",GSL_CONST_CGS_PROTON_MAGNETIC_MOMENT,"A cm^2"},
+/*{"bohr_magneton",GSL_CONST_CGS_BOHR_MAGNETON,"A cm^2"},*/
+/*{"nuclear_magneton",GSL_CONST_CGS_NUCLEAR_MAGNETON,"A cm^2"},*/
+/*{"electron_magnetic_moment",GSL_CONST_CGS_ELECTRON_MAGNETIC_MOMENT,"A cm^2"},*/
+/*{"proton_magnetic_moment",GSL_CONST_CGS_PROTON_MAGNETIC_MOMENT,"A cm^2"},*/
 {"molar_gas",GSL_CONST_CGS_MOLAR_GAS,"g cm^2 / K mol s^2"},
 {"standard_gas_volume",GSL_CONST_CGS_STANDARD_GAS_VOLUME,"cm^3 / mol"},
 {"minute",GSL_CONST_CGS_MINUTE,"s"},
@@ -76,9 +76,9 @@
 {"psi",GSL_CONST_CGS_PSI,"g / cm s^2"},
 {"poise",GSL_CONST_CGS_POISE,"g / cm s"},
 {"stokes",GSL_CONST_CGS_STOKES,"cm^2 / s"},
-{"faraday",GSL_CONST_CGS_FARADAY,"A s / mol"},
-{"electron_charge",GSL_CONST_CGS_ELECTRON_CHARGE,"A s"},
-{"gauss",GSL_CONST_CGS_GAUSS,"g / A s^2"},
+/*{"faraday",GSL_CONST_CGS_FARADAY,"A s / mol"},*/
+/*{"electron_charge",GSL_CONST_CGS_ELECTRON_CHARGE,"A s"},*/
+/*{"gauss",GSL_CONST_CGS_GAUSS,"g / A s^2"},*/
 {"stilb",GSL_CONST_CGS_STILB,"cd / cm^2"},
 {"lumen",GSL_CONST_CGS_LUMEN,"cd sr"},
 {"lux",GSL_CONST_CGS_LUX,"cd sr / cm^2"},
@@ -87,7 +87,7 @@
 {"lambert",GSL_CONST_CGS_LAMBERT,"cd sr / cm^2"},
 {"footlambert",GSL_CONST_CGS_FOOTLAMBERT,"cd sr / cm^2"},
 {"curie",GSL_CONST_CGS_CURIE,"1 / s"},
-{"roentgen",GSL_CONST_CGS_ROENTGEN,"A s / g"},
+/*{"roentgen",GSL_CONST_CGS_ROENTGEN,"A s / g"},*/
 {"rad",GSL_CONST_CGS_RAD,"cm^2 / s^2"},
 {"solar_mass",GSL_CONST_CGS_SOLAR_MASS,"g"},
 {"bohr_radius",GSL_CONST_CGS_BOHR_RADIUS,"cm"},
diff -ur pygsl-0.9.4.orig/src/const_cgsm_array.c pygsl-0.9.4/src/const_cgsm_array.c
--- pygsl-0.9.4.orig/src/const_cgsm_array.c	2006-12-21 12:20:15.000000000 +0000
+++ pygsl-0.9.4/src/const_cgsm_array.c	2009-09-15 18:36:50.000000000 +0100
@@ -77,7 +77,7 @@
 {"stokes",GSL_CONST_CGSM_STOKES,"cm^2 / s"},
 {"faraday",GSL_CONST_CGSM_FARADAY,"abamp s / mol"},
 {"electron_charge",GSL_CONST_CGSM_ELECTRON_CHARGE,"abamp s"},
-{"gauss",GSL_CONST_CGSM_GAUSS,"g / abamp s^2"},
+/*{"gauss",GSL_CONST_CGSM_GAUSS,"g / abamp s^2"},*/
 {"stilb",GSL_CONST_CGSM_STILB,"cd / cm^2"},
 {"lumen",GSL_CONST_CGSM_LUMEN,"cd sr"},
 {"lux",GSL_CONST_CGSM_LUX,"cd sr / cm^2"},


Index: pygsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygsl/devel/pygsl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- pygsl.spec	15 Sep 2009 16:48:36 -0000	1.24
+++ pygsl.spec	15 Sep 2009 17:46:26 -0000	1.25
@@ -7,7 +7,7 @@
 Summary:       GNU Scientific Library Interface for python
 Name:          pygsl
 Version:       0.9.4
-Release:       3%{?dist}
+Release:       4%{?dist}
 # The package is mostly GPL+ but there are two scripts
 # GLPv2+: pygsl/odeiv.py and examples/siman_tsp.py
 License:       GPLv2+
@@ -17,6 +17,8 @@ Url:           http://pygsl.sourceforge.
 Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:       COPYING
 
+Patch0:	       pygsl-0.9.4-removed-gsm-units.patch
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: numpy
 BuildRequires: gsl-devel
@@ -42,9 +44,10 @@ Development files for pygsl
 
 %prep
 %setup
+cp %{SOURCE1} .
+%patch0 -p1
 
 %build
-cp %{SOURCE1} .
 rm -f swig_src/gslwrap_wrap.c
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
 
@@ -67,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 José Matos <jamatos at fc.up.pt> - 0.9.4-4
+- Remove gsm units taken away in gsl-1.13.
+
 * Tue Sep 15 2009 José Matos <jamatos at fc.up.pt> - 0.9.4-3
 - Rebuild for new upstream gsl version (F12+).