From 5cacaf272d211df5080fa0825e7e6e500c28d4e3 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Thu, 12 Jun 2014 23:42:27 +0200 Subject: [PATCH] New upstream (3.370) - Patches for ppc64le and aarch64 added upstream --- .gitignore | 1 + cfitsio-zlib.patch | 50 ++++++++++++++++++++++++++++++++++------------ cfitsio.spec | 23 ++++++++++----------- sources | 2 +- 4 files changed, 50 insertions(+), 26 deletions(-) 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-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 4c3edc2..d08626c 100644 --- a/cfitsio.spec +++ b/cfitsio.spec @@ -1,23 +1,20 @@ Name: cfitsio -Version: 3.360 -Release: 4%{?dist} +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 Patch1: cfitsio-noversioncheck.patch # Some rearrangements in pkg-config file Patch2: cfitsio-pkgconfig.patch -# AArch64 platform definitions -Patch3: cfitsio-aarch64.patch -# ppc64le platform definitions -Patch4: cfitsio-ppc64le_support.patch BuildRequires: gcc-gfortran zlib-devel +BuildRequires: bzip2-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -83,19 +80,17 @@ compression algorithm. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 # remove bundled zlib # 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} @@ -146,6 +141,10 @@ 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 diff --git a/sources b/sources index d0f3504..bec74da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f98d8782b78594210def81234dfe79df cfitsio3360.tar.gz +346b4671ea9e19b90e083f9040ba3899 cfitsio3370.tar.gz