update to 4.3.0
This commit is contained in:
lyn1001
parent
03db9d682b
commit
6be3e8dbd1
Binary file not shown.
BIN
cfitsio-4.3.0.tar.gz
Normal file
BIN
cfitsio-4.3.0.tar.gz
Normal file
Binary file not shown.
@ -1,14 +1,12 @@
|
||||
diff -Naur cfitsio/configure cfitsio.ldflags/configure
|
||||
--- cfitsio/configure 2018-05-09 21:16:00.000000000 +0200
|
||||
+++ cfitsio.ldflags/configure 2018-05-23 17:17:18.452431657 +0200
|
||||
@@ -4215,8 +4215,8 @@
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
diff -Naur cfitsio-4.2.0/configure cfitsio-4.2.0.ldflags/configure
|
||||
--- cfitsio-4.2.0/configure 2022-10-31 19:40:23.000000000 +0100
|
||||
+++ cfitsio-4.2.0.ldflags/configure 2022-11-25 10:05:55.387220762 +0100
|
||||
@@ -4670,7 +4670,7 @@
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
-LDFLAGS="$CFLAGS"
|
||||
-LDFLAGS_BIN="$LDFLAGS"
|
||||
+# LDFLAGS="$CFLAGS"
|
||||
+LDFLAGS_BIN="$CFLAGS"
|
||||
LDFLAGS_BIN="$LDFLAGS"
|
||||
|
||||
if test "x$FC" = "xnone" ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -ur cfitsio-3.47/cfitsio.pc.in cfitsio-3.47.pkg/cfitsio.pc.in
|
||||
--- cfitsio-3.47/cfitsio.pc.in 2019-05-08 17:34:49.000000000 +0200
|
||||
+++ cfitsio-3.47.pkg/cfitsio.pc.in 2019-08-01 15:56:52.064310329 +0200
|
||||
@@ -1,12 +1,12 @@
|
||||
diff -ur cfitsio-4.0.0/cfitsio.pc.in cfitsio-4.0.0.pc/cfitsio.pc.in
|
||||
--- cfitsio-4.0.0/cfitsio.pc.in 2021-05-20 03:18:54.000000000 +0200
|
||||
+++ cfitsio-4.0.0.pc/cfitsio.pc.in 2021-12-03 17:38:32.302407819 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
@ -10,11 +10,3 @@ diff -ur cfitsio-3.47/cfitsio.pc.in cfitsio-3.47.pkg/cfitsio.pc.in
|
||||
|
||||
Name: cfitsio
|
||||
Description: FITS File Subroutine Library
|
||||
URL: https://heasarc.gsfc.nasa.gov/fitsio/
|
||||
Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@
|
||||
-Libs: -L${libdir} -lcfitsio
|
||||
-Libs.private: -lm @LIBS@
|
||||
-Cflags: -I${includedir}
|
||||
+Libs: -L${libdir} -lcfitsio
|
||||
+Libs.private: -lm -lz @LIBS@
|
||||
+Cflags: -D_REENTRANT -I${includedir}
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
diff -ur cfitsio-3.47/Makefile.in cfitsio-3.47.zlib/Makefile.in
|
||||
--- cfitsio-3.47/Makefile.in 2019-05-08 17:34:50.000000000 +0200
|
||||
+++ cfitsio-3.47.zlib/Makefile.in 2019-08-01 15:52:57.829760351 +0200
|
||||
@@ -68,9 +68,7 @@
|
||||
pliocomp.c fits_hcompress.c fits_hdecompress.c \
|
||||
simplerng.c @GSIFTP_SRC@
|
||||
|
||||
-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 \
|
||||
- zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c
|
||||
+ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c
|
||||
|
||||
SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
|
||||
|
||||
@@ -103,7 +101,7 @@
|
||||
shared: lib${PACKAGE}${SHLIB_SUFFIX}
|
||||
|
||||
lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
|
||||
- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
|
||||
+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
|
||||
@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
|
||||
ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
|
||||
ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
|
||||
@@ -140,28 +138,28 @@
|
||||
${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
|
||||
|
||||
smem: smem.o lib${PACKAGE}.a ${OBJECTS}
|
||||
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
|
||||
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
|
||||
|
||||
testprog: testprog.o lib${PACKAGE}.a ${OBJECTS}
|
||||
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||
|
||||
fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
|
||||
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||
|
||||
funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
|
||||
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||
|
||||
fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS}
|
||||
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||
|
||||
speed: speed.o lib${PACKAGE}.a ${OBJECTS}
|
||||
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||
|
||||
imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS}
|
||||
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||
|
||||
cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS}
|
||||
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||
|
||||
eval: # Rebuild eval_* files from flex/bison source
|
||||
${FLEX} -t eval.l > eval_l.c1
|
||||
32
cfitsio.spec
32
cfitsio.spec
@ -1,17 +1,16 @@
|
||||
Name: cfitsio
|
||||
Version: 3.490
|
||||
Release: 2
|
||||
Version: 4.3.0
|
||||
Release: 1
|
||||
Summary: Library for manipulating FITS data files
|
||||
License: MIT
|
||||
URL: http://heasarc.gsfc.nasa.gov/fitsio/
|
||||
Source0: https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz
|
||||
Source0: http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-%{version}.tar.gz
|
||||
|
||||
Patch0000: cfitsio-zlib.patch
|
||||
Patch0001: cfitsio-noversioncheck.patch
|
||||
Patch0002: cfitsio-pkgconfig.patch
|
||||
Patch0003: cfitsio-ldflags.patch
|
||||
|
||||
BuildRequires: gcc-gfortran zlib-devel bzip2-devel chrpath
|
||||
BuildRequires: gcc-gfortran zlib-devel bzip2-devel chrpath curl-devel make
|
||||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
|
||||
@ -62,11 +61,11 @@ a higher compression rate than lossless techniques
|
||||
to the accuracy in the original image) depends on the amount of compression
|
||||
|
||||
%prep
|
||||
%autosetup -n cfitsio-3.49 -p1
|
||||
cd 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
|
||||
cd -
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
# fix funpack/fpack -V
|
||||
sed -i 's/float version;/char* version = "%{version}";/g' fpackutil.c
|
||||
sed -i '/fits_get_version(&version);/d' fpackutil.c
|
||||
sed -i 's/%5.3f"/%s"/g' fpackutil.c
|
||||
|
||||
%build
|
||||
%configure --enable-reentrant --with-bzip2
|
||||
@ -81,12 +80,10 @@ cmp -s testprog.lis testprog.out
|
||||
cmp -s testprog.fit testprog.std
|
||||
|
||||
%install
|
||||
install -d %{buildroot}%{_bindir}
|
||||
install -d %{buildroot}%{_libdir}
|
||||
install -d %{buildroot}%{_includedir}/%{name}
|
||||
make LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}/%{name} CFITSIO_LIB=%{buildroot}%{_libdir} \
|
||||
CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} \
|
||||
install
|
||||
%make_install LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}/%{name} \
|
||||
CFITSIO_LIB=%{buildroot}%{_libdir} \
|
||||
CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name}
|
||||
|
||||
cp -p f{,un}pack %{buildroot}%{_bindir}
|
||||
|
||||
chmod 755 %{buildroot}%{_libdir}/libcfitsio.so.*
|
||||
@ -119,6 +116,9 @@ chrpath -d %{buildroot}%{_bindir}/f{,un}pack
|
||||
%{_bindir}/funpack
|
||||
|
||||
%changelog
|
||||
* Thu Sep 14 2023 liyanan <thistleslyn@163.com> - 4.3.0-1
|
||||
- update to 4.3.0
|
||||
|
||||
* Wed Aug 24 2022 caodongxia <caodongxia@h-partners.com> -3.490-2
|
||||
- Remove rpath
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user