rpms/cfitsio/devel cfitsio-s390.patch, NONE, 1.1 cfitsio.spec, 1.40, 1.41

[Karsten Hopp]

Author: karsten

Update of /cvs/extras/rpms/cfitsio/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11981

Modified Files:
	cfitsio.spec 
Added Files:
	cfitsio-s390.patch 
Log Message:
- add s390(x) as bigendian machines

cfitsio-s390.patch:
 fitsio2.h |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE cfitsio-s390.patch ---
diff -urN cfitsio/fitsio2.h cfitsio_new/fitsio2.h
--- cfitsio/fitsio2.h	2010-01-26 18:40:25.000000000 +0100
+++ cfitsio_new/fitsio2.h	2010-06-30 17:24:59.000000000 +0200
@@ -85,6 +85,14 @@
 #define MACHINE NATIVE
 #define LONGSIZE 64   
 
+#elif defined(__s390x__)
+#define BYTESWAPPED FALSE
+#define LONGSIZE 64
+
+#elif defined(__s390__)
+#define BYTESWAPPED FALSE
+#define LONGSIZE 32
+
 #elif defined(__ia64__)  || defined(__x86_64__)
                   /*  Intel itanium 64-bit PC, or AMD opteron 64-bit PC */
 #define BYTESWAPPED TRUE


Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- cfitsio.spec	21 Feb 2010 20:23:21 -0000	1.40
+++ cfitsio.spec	30 Jun 2010 15:46:03 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           cfitsio
 Version:        3.240
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
@@ -10,6 +10,7 @@ Source0:        ftp://heasarc.gsfc.nasa.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         cfitsio.patch
 Patch1:         cfitsio-pkgconfig.patch
+Patch2:         cfitsio-s390.patch
 
 BuildRequires:     gcc-gfortran
 Requires(post):    /sbin/ldconfig
@@ -53,6 +54,7 @@ Stand-alone documentation for cfitsio.
 %setup -q -n cfitsio
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 FC=f95
@@ -110,6 +112,9 @@ rm -rf %{buildroot}
 %doc fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps
 
 %changelog
+* Wed Jun 30 2010 Karsten Hopp <karsten at redhat.com> 3.240-4
+- add s390(x) as bigendian machines
+
 * Sun Feb 21 2010 Matthew Truch <matt at truch.net> - 3.240-3
 - Fix pkgconfig file which contains the wrong version number.