diff --git a/.gitignore b/.gitignore index c219ff8..59c67fa 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ cfitsio3250.tar.gz /cfitsio3340.tar.gz /cfitsio3350.tar.gz /cfitsio3360.tar.gz +/cfitsio3370.tar.gz diff --git a/cfitsio-aarch64.patch b/cfitsio-aarch64.patch new file mode 100644 index 0000000..54731f3 --- /dev/null +++ b/cfitsio-aarch64.patch @@ -0,0 +1,22 @@ +diff --git a/fitsio2.h b/fitsio2.h +index 27793a7..66e4bcb 100644 +--- a/fitsio2.h ++++ b/fitsio2.h +@@ -96,7 +96,7 @@ extern int Fitsio_Pthread_Status; + #define BYTESWAPPED FALSE + #define LONGSIZE 32 + +-#elif defined(__ia64__) || defined(__x86_64__) ++#elif defined(__ia64__) || defined(__x86_64__) || defined(__AARCH64EL__) + /* Intel itanium 64-bit PC, or AMD opteron 64-bit PC */ + #define BYTESWAPPED TRUE + #define LONGSIZE 64 +@@ -107,7 +107,7 @@ extern int Fitsio_Pthread_Status; + #define MACHINE NATIVE + #define LONGSIZE 64 + +-#elif defined(__powerpc64__) || defined(__64BIT__) /* IBM 64-bit AIX powerpc*/ ++#elif defined(__powerpc64__) || defined(__64BIT__) || defined(__AARCH64EB__) /* IBM 64-bit AIX powerpc*/ + /* could also test for __ppc64__ or __PPC64 */ + #define BYTESWAPPED FALSE + #define MACHINE NATIVE diff --git a/cfitsio-ppc64le_support.patch b/cfitsio-ppc64le_support.patch new file mode 100644 index 0000000..b44369b --- /dev/null +++ b/cfitsio-ppc64le_support.patch @@ -0,0 +1,31 @@ +Subject: cfitsio ppc64le support +From: Michel Normand + +for ppc64le archi should define BYTESWAPPED but not MACHINE + +Signed-off-by: Michel Normand +--- + fitsio2.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +Index: cfitsio/fitsio2.h +=================================================================== +--- cfitsio.orig/fitsio2.h ++++ cfitsio/fitsio2.h +@@ -109,9 +109,13 @@ extern int Fitsio_Pthread_Status; + + #elif defined(__powerpc64__) || defined(__64BIT__) || defined(__AARCH64EB__) /* IBM 64-bit AIX powerpc*/ + /* could also test for __ppc64__ or __PPC64 */ +-#define BYTESWAPPED FALSE +-#define MACHINE NATIVE +-#define LONGSIZE 64 ++# if defined(__LITTLE_ENDIAN__) ++# define BYTESWAPPED TRUE ++# else ++# define BYTESWAPPED FALSE ++# define MACHINE NATIVE ++# endif ++# define LONGSIZE 64 + + #elif defined(_MIPS_SZLONG) + diff --git a/cfitsio-zlib.patch b/cfitsio-zlib.patch index 543b184..fea97b1 100644 --- a/cfitsio-zlib.patch +++ b/cfitsio-zlib.patch @@ -1,9 +1,9 @@ -diff -ur cfitsio/Makefile.in cfitsio.no-zlib/Makefile.in ---- cfitsio/Makefile.in 2013-12-05 23:20:57.000000000 +0100 -+++ cfitsio.no-zlib/Makefile.in 2013-12-09 11:05:55.332013282 +0100 -@@ -62,9 +62,7 @@ - swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \ - pliocomp.c fits_hcompress.c fits_hdecompress.c +diff -ur cfitsio/Makefile.in cfitsio.zlib/Makefile.in +--- cfitsio/Makefile.in 2014-06-03 20:51:29.000000000 +0200 ++++ cfitsio.zlib/Makefile.in 2014-06-12 16:29:17.480249747 +0200 +@@ -63,9 +63,7 @@ + pliocomp.c fits_hcompress.c fits_hdecompress.c \ + simplerng.c -ZLIB_SOURCES = zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \ - zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \ @@ -12,7 +12,7 @@ diff -ur cfitsio/Makefile.in cfitsio.no-zlib/Makefile.in SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@ -@@ -97,7 +95,7 @@ +@@ -98,7 +96,7 @@ shared: libcfitsio${SHLIB_SUFFIX} libcfitsio${SHLIB_SUFFIX}: ${OBJECTS} @@ -21,20 +21,44 @@ diff -ur cfitsio/Makefile.in cfitsio.no-zlib/Makefile.in @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \ ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \ ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ -@@ -118,13 +116,13 @@ - ${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm +@@ -116,31 +114,31 @@ + $(CC) -c $(CFLAGS) $(SSE_FLAGS) $(DEFS) $< + + smem: smem.o libcfitsio.a ${OBJECTS} +- ${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm ++ ${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm -lz testprog: testprog.o libcfitsio.a ${OBJECTS} - ${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS} -+ ${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lz -lm ${LIBS} ++ ${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm -lz ${LIBS} fpack: fpack.o fpackutil.o libcfitsio.a ${OBJECTS} - ${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o libcfitsio.a -lm ${LIBS} -+ ${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o -L. -lcfitsio -lz -lm ${LIBS} ++ ${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o libcfitsio.a -lm -lz ${LIBS} funpack: funpack.o fpackutil.o libcfitsio.a ${OBJECTS} - ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o libcfitsio.a -lm ${LIBS} -+ ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o -L. -lcfitsio -lz -lm ${LIBS} ++ ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o libcfitsio.a -lm -lz ${LIBS} fitscopy: fitscopy.o libcfitsio.a ${OBJECTS} - ${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS} +- ${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS} ++ ${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm -lz ${LIBS} + + speed: speed.o libcfitsio.a ${OBJECTS} +- ${CC} $(CFLAGS) $(DEFS) -o speed speed.o -L. -lcfitsio -lm ${LIBS} ++ ${CC} $(CFLAGS) $(DEFS) -o speed speed.o -L. -lcfitsio -lm -lz ${LIBS} + + imcopy: imcopy.o libcfitsio.a ${OBJECTS} +- ${CC} $(CFLAGS) $(DEFS) -o imcopy imcopy.o -L. -lcfitsio -lm ${LIBS} ++ ${CC} $(CFLAGS) $(DEFS) -o imcopy imcopy.o -L. -lcfitsio -lm -lz ${LIBS} + + listhead: listhead.o libcfitsio.a ${OBJECTS} +- ${CC} $(CFLAGS) $(DEFS) -o listhead listhead.o -L. -lcfitsio -lm ${LIBS} ++ ${CC} $(CFLAGS) $(DEFS) -o listhead listhead.o -L. -lcfitsio -lm -lz ${LIBS} + + cookbook: cookbook.o libcfitsio.a ${OBJECTS} +- ${CC} $(CFLAGS) $(DEFS) -o cookbook cookbook.o -L. -lcfitsio -lm ${LIBS} ++ ${CC} $(CFLAGS) $(DEFS) -o cookbook cookbook.o -L. -lcfitsio -lm -lz ${LIBS} + + eval: # Rebuild eval_* files from flex/bison source + $(FLEX) -t eval.l > eval_l.c1 diff --git a/cfitsio.spec b/cfitsio.spec index 421e678..501b0dd 100644 --- a/cfitsio.spec +++ b/cfitsio.spec @@ -1,11 +1,11 @@ Name: cfitsio -Version: 3.360 +Version: 3.370 Release: 1%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries License: MIT URL: http://heasarc.gsfc.nasa.gov/fitsio/ -Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3360.tar.gz +Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3370.tar.gz # Unbundles zlib Patch0: cfitsio-zlib.patch # Remove soname version check @@ -14,6 +14,7 @@ Patch1: cfitsio-noversioncheck.patch Patch2: cfitsio-pkgconfig.patch BuildRequires: gcc-gfortran zlib-devel +BuildRequires: bzip2-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -84,12 +85,12 @@ compression algorithm. # not all the files inside zlib belong to zlib pushd zlib rm adler32.c crc32.c deflate.c infback.c inffast.c inflate.c inflate.h \ - inftrees.c inftrees.h zlib.h deflate.h trees.c trees.h uncompr.c zconf.h \ - zutil.c zutil.h crc32.h inffast.h inffixed.h +inftrees.c inftrees.h zlib.h deflate.h trees.c trees.h uncompr.c zconf.h \ +zutil.c zutil.h crc32.h inffast.h inffixed.h popd %build -%configure --enable-reentrant +%configure --enable-reentrant --with-bzip2 make shared %{?_smp_mflags} make fpack %{?_smp_mflags} make funpack %{?_smp_mflags} @@ -140,6 +141,19 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack %{_bindir}/funpack %changelog +* Thu Jun 12 2014 Sergio Pascual - 3.370-1 +- New upstream (3.370) +- Patches for ppc64le and aarch64 added upstream + +* Sat Jun 07 2014 Fedora Release Engineering - 3.360-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 15 2014 Sergio Pascual - 3.360-3 +- Add ppc64le support (bz #1097248). + +* Tue Apr 15 2014 Marcin Juszkiewicz - 3.360-2 +- Add AArch64 support. + * Mon Dec 09 2013 Sergio Pascual - 3.360-1 - New upstream (3.360) diff --git a/sources b/sources index d0f3504..bec74da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f98d8782b78594210def81234dfe79df cfitsio3360.tar.gz +346b4671ea9e19b90e083f9040ba3899 cfitsio3370.tar.gz