rpms/cfitsio/F-11 cfitsio-sparc64.patch, NONE, 1.1 cfitsio.spec, 1.32, 1.33

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/cfitsio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14095

Modified Files:
	cfitsio.spec 
Added Files:
	cfitsio-sparc64.patch 
Log Message:
add patch to support sparc64 correctly


cfitsio-sparc64.patch:

--- NEW FILE cfitsio-sparc64.patch ---
diff -uNr cfitsio-orig/fitsio2.h cfitsio/fitsio2.h
--- cfitsio-orig/fitsio2.h	2008-12-02 15:28:35.000000000 -0600
+++ cfitsio/fitsio2.h	2009-06-13 12:41:37.000000000 -0500
@@ -54,7 +54,7 @@
 #define BYTESWAPPED TRUE
 #define LONGSIZE 64
 
-#elif defined(__sparcv9)
+#elif defined(__sparcv9) || (defined(__sparc__) && defined(__arch64__))
                                /*  SUN Solaris7 in 64-bit mode */
 #define BYTESWAPPED FALSE
 #define MACHINE NATIVE
diff -uNr cfitsio-orig/fitsio.h cfitsio/fitsio.h
--- cfitsio-orig/fitsio.h	2009-01-05 11:20:41.000000000 -0600
+++ cfitsio/fitsio.h	2009-06-13 12:49:45.000000000 -0500
@@ -80,7 +80,7 @@
     ||  defined(__x86_64__) \
 */
 #if (defined(__alpha) && ( defined(__unix__) || defined(__NetBSD__) )) \
-    ||  defined(__sparcv9)  \
+    ||  defined(__sparcv9) || (defined(__sparc__) && defined(__arch64__)) \
     ||  defined(__powerpc64__) || defined(__64BIT__) \
     ||  (defined(_MIPS_SZLONG) &&  _MIPS_SZLONG == 64) \
     ||  defined( _MSC_VER)|| defined(__BORLANDC__)


Index: cfitsio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cfitsio/F-11/cfitsio.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- cfitsio.spec	10 Mar 2009 19:37:46 -0000	1.32
+++ cfitsio.spec	13 Jun 2009 17:56:15 -0000	1.33
@@ -1,13 +1,14 @@
 Name:           cfitsio
 Version:        3.130
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
 Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3130.tar.gz
-Patch:          cfitsio.patch
+Patch0:         cfitsio.patch
+Patch1:         cfitsio-sparc64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     gcc-gfortran
@@ -42,7 +43,8 @@ Static cfitsio library; avoid use if pos
 
 %prep
 %setup -q -n cfitsio
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 FC=f95
@@ -98,6 +100,9 @@ rm -rf %{buildroot}
 %{_libdir}/libcfitsio.a
 
 %changelog
+* Sat Jun 13 2009 Dennis Gilmore <dennis at ausil.us> - 3.130-5
+- patch for 64 bit sparc linux 
+
 * Tue Mar 10 2009 Matthew Truch <matt at truch.net> - 3.130-4
 - Set correct version in pkgconfig .pc file.