rpms
/
cfitsio
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new version

Browse Source
epel9
Christian Dersch 7 years ago
parent 8181f73b7f
commit ef69e49ea7
6 changed files with 46 additions and 115 deletions
Show Stats Download Patch File Download Diff File

22
cfitsio-aarch64.patch
Unescape View File

@ -1,22 +0,0 @@
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

12
cfitsio-fix-hcompress-overflow.patch
Unescape View File

@ -1,12 +0,0 @@
diff -Naur cfitsio/imcompress.c cfitsio.new/imcompress.c
--- cfitsio/imcompress.c 2013-11-22 21:37:42.000000000 +0100
+++ cfitsio.new/imcompress.c 2017-10-02 14:59:15.109929047 +0200
@@ -6315,7 +6315,7 @@
*/
if ((infptr->Fptr)->compress_type == HCOMPRESS_1) {
- if (*status == NUM_OVERFLOW) *status = 0;
+ if ((*status == NUM_OVERFLOW) || (*status == OVERFLOW_ERR)) *status = 0;
}
}
else if (tiledatatype == TSHORT)

8
cfitsio-noversioncheck.patch
Unescape View File

@ -1,6 +1,6 @@
diff -ur cfitsio/longnam.h cfitsio.new/longnam.h diff -Naur cfitsio/longnam.h cfitsio.noversioncheck/longnam.h
--- cfitsio/longnam.h 2013-04-04 21:45:41.000000000 +0200 --- cfitsio/longnam.h 2017-09-20 21:40:41.000000000 +0200
+++ cfitsio.new/longnam.h 2013-07-04 11:05:16.423095453 +0200 +++ cfitsio.noversioncheck/longnam.h 2018-02-23 14:42:36.246522445 +0100
@@ -19,7 +19,8 @@ @@ -19,7 +19,8 @@
that was used to build the CFITSIO library is compatible with the version that was used to build the CFITSIO library is compatible with the version
as included when compiling the application program as included when compiling the application program
@ -10,4 +10,4 @@ diff -ur cfitsio/longnam.h cfitsio.new/longnam.h
+#define fits_open_file ffopen +#define fits_open_file ffopen
#define fits_open_data ffdopn #define fits_open_data ffdopn
#define fits_open_table fftopn #define fits_open_extlist ffeopn

31
cfitsio-ppc64le_support.patch
Unescape View File

@ -1,31 +0,0 @@
Subject: cfitsio ppc64le support
From: Michel Normand <normand@linux.vnet.ibm.com>
for ppc64le archi should define BYTESWAPPED but not MACHINE
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
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)

74
cfitsio-zlib.patch
Unescape View File

@ -1,7 +1,7 @@
diff -ur cfitsio/Makefile.in cfitsio.zlib/Makefile.in diff -Naur cfitsio/Makefile.in cfitsio.zlib/Makefile.in
--- cfitsio/Makefile.in 2014-06-03 20:51:29.000000000 +0200 --- cfitsio/Makefile.in 2017-09-20 21:40:40.000000000 +0200
+++ cfitsio.zlib/Makefile.in 2014-06-12 16:29:17.480249747 +0200 +++ cfitsio.zlib/Makefile.in 2018-02-23 14:36:44.439214375 +0100
@@ -63,9 +63,7 @@ @@ -68,9 +68,7 @@
pliocomp.c fits_hcompress.c fits_hdecompress.c \ pliocomp.c fits_hcompress.c fits_hdecompress.c \
simplerng.c simplerng.c
@ -12,53 +12,49 @@ diff -ur cfitsio/Makefile.in cfitsio.zlib/Makefile.in
SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@ SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
@@ -98,7 +96,7 @@ @@ -103,7 +101,7 @@
shared: libcfitsio${SHLIB_SUFFIX} shared: lib${PACKAGE}${SHLIB_SUFFIX}
libcfitsio${SHLIB_SUFFIX}: ${OBJECTS} lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS} - ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS}
+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz ${LIBS} + ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS}
@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \ @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \ ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
@@ -116,31 +114,31 @@ @@ -140,28 +138,28 @@
$(CC) -c $(CFLAGS) $(SSE_FLAGS) $(DEFS) $< ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
smem: smem.o libcfitsio.a ${OBJECTS} smem: smem.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm - ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
+ ${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm -lz + ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
testprog: testprog.o libcfitsio.a ${OBJECTS} testprog: testprog.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS} - ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm -lz ${LIBS} + ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
fpack: fpack.o fpackutil.o libcfitsio.a ${OBJECTS} fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o libcfitsio.a -lm ${LIBS} - ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o libcfitsio.a -lm -lz ${LIBS} + ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
funpack: funpack.o fpackutil.o libcfitsio.a ${OBJECTS} funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o libcfitsio.a -lm ${LIBS} - ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o libcfitsio.a -lm -lz ${LIBS} + ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
fitscopy: fitscopy.o libcfitsio.a ${OBJECTS} fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS} - ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm -lz ${LIBS} + ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
speed: speed.o libcfitsio.a ${OBJECTS} speed: speed.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o speed speed.o -L. -lcfitsio -lm ${LIBS} - ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o speed speed.o -L. -lcfitsio -lm -lz ${LIBS} + ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
imcopy: imcopy.o libcfitsio.a ${OBJECTS} imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o imcopy imcopy.o -L. -lcfitsio -lm ${LIBS} - ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o imcopy imcopy.o -L. -lcfitsio -lm -lz ${LIBS} + ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
listhead: listhead.o libcfitsio.a ${OBJECTS} cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o listhead listhead.o -L. -lcfitsio -lm ${LIBS} - ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o listhead listhead.o -L. -lcfitsio -lm -lz ${LIBS} + ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -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 eval: # Rebuild eval_* files from flex/bison source
$(FLEX) -t eval.l > eval_l.c1 ${FLEX} -t eval.l > eval_l.c1

14
cfitsio.spec
Unescape View File

@ -1,19 +1,17 @@
Name: cfitsio Name: cfitsio
Version: 3.370 Version: 3.420
Release: 11%{?dist} Release: 1%{?dist}
Summary: Library for manipulating FITS data files Summary: Library for manipulating FITS data files
Group: Development/Libraries
License: MIT License: MIT
URL: http://heasarc.gsfc.nasa.gov/fitsio/ URL: http://heasarc.gsfc.nasa.gov/fitsio/
Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3370.tar.gz Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3420.tar.gz
# Unbundles zlib # Unbundles zlib
Patch0: cfitsio-zlib.patch Patch0: cfitsio-zlib.patch
# Remove soname version check # Remove soname version check
Patch1: cfitsio-noversioncheck.patch Patch1: cfitsio-noversioncheck.patch
# Some rearrangements in pkg-config file # Some rearrangements in pkg-config file
Patch2: cfitsio-pkgconfig.patch Patch2: cfitsio-pkgconfig.patch
# Backported fix for hcompress
Patch3: cfitsio-fix-hcompress-overflow.patch
BuildRequires: gcc-gfortran zlib-devel BuildRequires: gcc-gfortran zlib-devel
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
@ -82,7 +80,6 @@ compression algorithm.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# remove bundled zlib # remove bundled zlib
# not all the files inside zlib belong to zlib # not all the files inside zlib belong to zlib
@ -145,6 +142,9 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
%{_bindir}/funpack %{_bindir}/funpack
%changelog %changelog
* Fri Feb 23 2018 Christian Dersch <lupinix@mailbox.org> - 3.420-1
- new version
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.370-11 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.370-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Write Preview
Loading…
Cancel
Save