diff --git a/cfitsio-s390.patch b/cfitsio-s390.patch new file mode 100644 index 0000000..bf7b52d --- /dev/null +++ b/cfitsio-s390.patch @@ -0,0 +1,18 @@ +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 diff --git a/cfitsio.spec b/cfitsio.spec index 9f56830..5cf2af1 100644 --- a/cfitsio.spec +++ b/cfitsio.spec @@ -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.gov/software/fitsio/c/cfitsio3240.tar.gz 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 3.240-4 +- add s390(x) as bigendian machines + * Sun Feb 21 2010 Matthew Truch - 3.240-3 - Fix pkgconfig file which contains the wrong version number.