rpms/healpy/EL-5 healpy-0.9.6-fedoralib.patch, NONE, 1.1 healpy.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[jsmidt]

Author: jsmidt

Update of /cvs/pkgs/rpms/healpy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30383/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	healpy-0.9.6-fedoralib.patch healpy.spec import.log 
Log Message:
Initial import of Healpy


healpy-0.9.6-fedoralib.patch:

--- NEW FILE healpy-0.9.6-fedoralib.patch ---
# Patch healpy to build against Fedora's healpix-c++ and cfitsio librarys.

diff -up healpy-0.9.6.1/setup.py.fedoralib healpy-0.9.6.1/setup.py
--- healpy-0.9.6.1/setup.py.fedoralib	2009-06-12 19:34:51.668835535 -0700
+++ healpy-0.9.6.1/setup.py	2009-06-12 19:35:53.014834130 -0700
@@ -1,9 +1,6 @@
 #!/usr/bin/env python
 
 
-
-HEALPIX_TARGET='generic_gcc'
-
 from distutils.core import setup, Extension
 from os.path import join,isdir
 import sys
@@ -11,14 +8,6 @@ import sys
 from numpy import get_include
 numpy_inc = get_include()
 
-def compile_healpix_cxx(target):
-    import os
-    print "Compiling healpix_cxx (this may take a while)"
-    compil_result = os.system('cd hpbeta && '
-                              'HEALPIX_TARGET=%s make '%(target))
-    if compil_result != 0:
-        raise Exception('Error while compiling healpix_cxx')
-
 
 def get_version():
     try:
@@ -37,16 +26,10 @@ healpy_fitsio_src = ['_healpy_fitsio_lib
 ################################################
 #
 #    Healpix data (pixel window and ring files
-healpix_cxx_dir='hpbeta/%s'%HEALPIX_TARGET
-healpix_cxx_inc = healpix_cxx_dir+'/include'
+healpix_cxx_dir='/usr'
+healpix_cxx_inc = healpix_cxx_dir+'/include/healpix'
 healpix_cxx_lib = healpix_cxx_dir+'/lib'
 
-if sys.argv[1] != 'sdist':
-    compile_healpix_cxx(HEALPIX_TARGET)
-
-    if not ( isdir(healpix_cxx_dir+'/include') and
-             isdir(healpix_cxx_dir+'/lib') ):
-        raise IOError("No inlcude and lib directory : needed for healpy !")
 
 ###############################################
 
@@ -56,14 +39,16 @@ pixel_lib = Extension('healpy._healpy_pi
                                for s in healpy_pixel_lib_src],
                       include_dirs=[numpy_inc,healpix_cxx_inc],
                       library_dirs=[healpix_cxx_lib],
-                      libraries=['healpix_cxx','fftpack','cxxsupport','cfitsio']
+                      libraries=['healpix_cxx','healpix_fft',
+                                 'healpix_cxxsupport','cfitsio']
                       )
 
 spht_lib = Extension('healpy._healpy_sph_transform_lib',
                      sources=[join('healpy','src',s) for s in healpy_spht_src],
                      include_dirs=[numpy_inc,healpix_cxx_inc],
                      library_dirs=[healpix_cxx_lib],
-                     libraries=['healpix_cxx','fftpack','cxxsupport','cfitsio']
+                     libraries=['healpix_cxx','healpix_fft',
+                                'healpix_cxxsupport','cfitsio']
                      )
 
 hfits_lib = Extension('healpy._healpy_fitsio_lib',
@@ -71,8 +56,8 @@ hfits_lib = Extension('healpy._healpy_fi
                                for s in healpy_fitsio_src],
                       include_dirs=[numpy_inc,healpix_cxx_inc],
                       library_dirs=[healpix_cxx_lib],
-                      libraries=['healpix_cxx','fftpack',
-                                 'cxxsupport','cfitsio']
+                      libraries=['healpix_cxx','healpix_fft',
+                                 'healpix_cxxsupport','cfitsio']
                       )
 
 # 


--- NEW FILE healpy.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:		healpy
Version:	0.9.6.1	
Release:	3%{?dist}
Summary:	A python wrapper of the healpix library	

Group:		Applications/Engineering	
License:	GPLv2+	
URL:		http://code.google.com/p/healpy/	
Source0:	http://healpy.googlecode.com/files/%{name}-%{version}.tar.gz
Patch:		healpy-0.9.6-fedoralib.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	python-devel >= 2.4 
BuildRequires:	healpix-c++-devel >= 2.11 
BuildRequires:	cfitsio-devel
BuildRequires:	numpy >= 1.0.1 
Requires:	numpy >= 1.0.1 
Requires:	python-matplotlib >= 0.98.4
Requires:	pyfits 

%description
Healpy provides a python package to manipulate healpix maps. It is based
on the standard numeric and visualisation tools for Python, Numpy and
matplotlib.  To find find more information about Healpix, please visit
its home page at http://healpix.jpl.nasa.gov/. 

%prep
%setup -q -n %{name}-%{version}

# Patch healpy to build against Fedora's healpix-c++ and cfitsio librarys.
%patch -p1 -b .fedoralib

# Move COPYING file to top of directory
cp -p hpbeta/COPYING .

# Physically remove the directory containing healpy's healpix-c++ and cfitsio.
rm -rf hpbeta/


%build
export CC="gcc"
export CXX="g++"
export CFLAGS="%{optflags} -fopenmp"
export CXXFLAGS="$CFLAGS"

%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

chmod 755 %{buildroot}%{python_sitearch}/%{name}/*.so


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc PKG-INFO ChangeLog test/test_fit_dipole.py COPYING
%{python_sitearch}/*egg-info
%{python_sitearch}/%{name}/


%changelog
* Wed Jun 17 2009 Joseph Smidt <josephsmidt at gmail.com> 0.9.6.1-3
- Changed name back to healpy

* Tue Jun 16 2009 Joseph Smidt <josephsmidt at gmail.com> 0.9.6.1-2
- Changed permissions on *.so files to '755'
- Add ChangeLog and test/test_fit_dipole.py to %%doc.
- Add COPYING to documentation

* Fri Jun 12 2009 Joseph Smidt <josephsmidt at gmail.com> 0.9.6.1-1
- New upstream release.
- Added CFLAGS and CXXFLAGS
- Added -fopenmp to build FLAGS
- Added minimum dependency package versions as recommended by upstream.

* Mon Jun 8 2009 Joseph Smidt <josephsmidt at gmail.com> 0.9.6-4
- Removed cfitsio and healpix-c++ from Requires.
- Added numpy to BuildRequires 

* Mon Jun 8 2009 Joseph Smidt <josephsmidt at gmail.com> 0.9.6-3
- Removed cfitsio and healpix-c++ from Requires.
- Removed INSTALL from %%doc section.
- Remove healpix and cfitso libraries from tarball during build.

* Mon Jun 8 2009 Joseph Smidt <josephsmidt at gmail.com> 0.9.6-2
- Patch healpy to build against Fedora's healpix-c++ and cfitsio librarys.

* Sun Jun 7 2009 Joseph Smidt <josephsmidt at gmail.com> 0.9.6-1
- Initial RPM release.


--- NEW FILE import.log ---
healpy-0_9_6_1-3_fc11:EL-5:healpy-0.9.6.1-3.fc11.src.rpm:1245365489


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/healpy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	18 Jun 2009 20:25:22 -0000	1.1
+++ .cvsignore	18 Jun 2009 22:57:39 -0000	1.2
@@ -0,0 +1 @@
+healpy-0.9.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	18 Jun 2009 20:25:22 -0000	1.1
+++ sources	18 Jun 2009 22:57:39 -0000	1.2
@@ -0,0 +1 @@
+faeb718d9d0c0aeae2385a027a185b6a  healpy-0.9.6.1.tar.gz