rpms/pygsl/devel pygsl-0.9.4-removed-gsm-units-upstream.patch, NONE, 1.1 pygsl.spec, 1.26, 1.27 pygsl-0.9.4-removed-gsm-units.patch, 1.1, NONE

[José Abílio Oliveira Matos]

Author: jamatos

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

Modified Files:
	pygsl.spec 
Added Files:
	pygsl-0.9.4-removed-gsm-units-upstream.patch 
Removed Files:
	pygsl-0.9.4-removed-gsm-units.patch 
Log Message:
* Thu Nov 19 2009 José Matos <jamatos at fc.up.pt> - 0.9.4-6
- Request build with the upstream patch.


pygsl-0.9.4-removed-gsm-units-upstream.patch:
 const_cgs_array.c |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

--- NEW FILE pygsl-0.9.4-removed-gsm-units-upstream.patch ---
--- pygsl-0.9.4/src/const_cgs_array.c	2005/04/28 15:27:56	1.3
+++ pygsl-0.9.4/src/const_cgs_array.c	2009/09/22 12:56:45	1.4
@@ -2,7 +2,6 @@
 {"gravitational_constant",GSL_CONST_CGS_GRAVITATIONAL_CONSTANT,"cm^3 / g s^2"},
 {"plancks_constant_h",GSL_CONST_CGS_PLANCKS_CONSTANT_H,"g cm^2 / s"},
 {"plancks_constant_hbar",GSL_CONST_CGS_PLANCKS_CONSTANT_HBAR,"g cm^2 / s"},
-/*{"vacuum_permeability",GSL_CONST_CGS_VACUUM_PERMEABILITY,"cm g / A^2 s^2"},*/
 {"astronomical_unit",GSL_CONST_CGS_ASTRONOMICAL_UNIT,"cm"},
 {"light_year",GSL_CONST_CGS_LIGHT_YEAR,"cm"},
 {"parsec",GSL_CONST_CGS_PARSEC,"cm"},
@@ -14,10 +13,6 @@
 {"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"},
 {"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 +71,6 @@
 {"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"},
 {"stilb",GSL_CONST_CGS_STILB,"cd / cm^2"},
 {"lumen",GSL_CONST_CGS_LUMEN,"cd sr"},
 {"lux",GSL_CONST_CGS_LUX,"cd sr / cm^2"},
@@ -91,8 +83,9 @@
 {"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"},
-/*{"vacuum_permittivity",GSL_CONST_CGS_VACUUM_PERMITTIVITY,"A^2 s^4 / g cm^3"},*/
 {"newton",GSL_CONST_CGS_NEWTON,"cm g / s^2"},
 {"dyne",GSL_CONST_CGS_DYNE,"cm g / s^2"},
 {"joule",GSL_CONST_CGS_JOULE,"g cm^2 / s^2"},
 {"erg",GSL_CONST_CGS_ERG,"g cm^2 / s^2"},
+{"stefan_boltzmann_constant",GSL_CONST_CGS_STEFAN_BOLTZMANN_CONSTANT,"g / K^4 s^3"},
+{"thomson_cross_section",GSL_CONST_CGS_THOMSON_CROSS_SECTION,"cm^2"},


Index: pygsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygsl/devel/pygsl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- pygsl.spec	19 Nov 2009 19:08:24 -0000	1.26
+++ pygsl.spec	19 Nov 2009 19:16:23 -0000	1.27
@@ -7,7 +7,7 @@
 Summary:       GNU Scientific Library Interface for python
 Name:          pygsl
 Version:       0.9.4
-Release:       5%{?dist}
+Release:       6%{?dist}
 # The package is mostly GPL+ but there are two scripts
 # GLPv2+: pygsl/odeiv.py and examples/siman_tsp.py
 License:       GPLv2+
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 19 2009 José Matos <jamatos at fc.up.pt> - 0.9.4-6
+- Request build with the upstream patch.
+
 * Thu Nov 19 2009 José Matos <jamatos at fc.up.pt> - 0.9.4-5
 - Fix typo in -devel Summary. (#504881)
 


--- pygsl-0.9.4-removed-gsm-units.patch DELETED ---