rpms/scipy/F-9 stsci_convolve_setup.py, NONE, 1.1 stsci_image_setup.py, NONE, 1.1 scipy.spec, 1.11, 1.12
Jef Spaleta
jspaleta at fedoraproject.org
Fri Oct 3 21:13:49 UTC 2008
Author: jspaleta
Update of /cvs/pkgs/rpms/scipy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31154
Modified Files:
scipy.spec
Added Files:
stsci_convolve_setup.py stsci_image_setup.py
Log Message:
* Fri Oct 03 2008 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6.0-7
- fix the stsci fix
--- NEW FILE stsci_convolve_setup.py ---
#!/usr/bin/env python
import numpy
def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
config = Configuration('convolve',parent_package,top_path,
package_path='lib')
config.add_extension('_correlate',
sources=["src/_correlatemodule.c"],
define_macros = [('NUMPY', '1')],
include_dirs = [numpy.get_numarray_include()])
config.add_extension('_lineshape',
sources=["src/_lineshapemodule.c"],
define_macros = [('NUMPY', '1')],
include_dirs = [numpy.get_numarray_include()])
return config
if __name__ == "__main__":
from numpy.distutils.core import setup
config = configuration(top_path='').todict()
setup(author='Todd Miller',
author_email = 'help at stsci.edu',
description = 'image array convolution functions',
version = '2.0',
**config)
--- NEW FILE stsci_image_setup.py ---
#!/usr/bin/env python
import numpy
def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
config = Configuration('image',parent_package,top_path,
package_path='lib')
config.add_extension('_combine',
sources=["src/_combinemodule.c"],
define_macros = [('NUMPY', '1')],
include_dirs = [numpy.get_numarray_include()])
return config
if __name__ == "__main__":
from numpy.distutils.core import setup
config = configuration(top_path='').todict()
setup(author='Todd Miller',
author_email = 'help at stsci.edu',
description = 'image array manipulation functions',
version = '2.0',
**config)
Index: scipy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scipy/F-9/scipy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scipy.spec 19 Feb 2008 07:28:07 -0000 1.11
+++ scipy.spec 3 Oct 2008 21:13:18 -0000 1.12
@@ -3,12 +3,16 @@
Summary: Scipy: Scientific Tools for Python
Name: scipy
Version: 0.6.0
-Release: 5%{?dist}
+Release: 7%{?dist}
Group: Development/Libraries
License: BSD and LGPLv2+
Url: http://www.scipy.org
Source0: http://prdownloads.sourceforge.net/scipy/%{name}-%{version}.tar.gz
+# Missing setup.py files which control the build of this module
+# These should be removed as soon as upstream pushes a release with this fixed
+Source1: stsci_image_setup.py
+Source2: stsci_convolve_setup.py
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +48,9 @@
umfpack_libs = umfpack
EOF
+cp %{SOURCE1} scipy/stsci/image/setup.py
+cp %{SOURCE2} scipy/stsci/convolve/setup.py
+
%build
env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py config_fc --fcompiler=gnu95 --noarch build
@@ -66,6 +73,12 @@
%changelog
+* Fri Oct 03 2008 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6.0-7
+- fix the stsci fix
+
+* Thu Oct 02 2008 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6.0-6
+- include missing setup files for stsci module
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.6.0-5
- Autorebuild for GCC 4.3
More information about the fedora-extras-commits
mailing list