add-support-for-loongarch64.patch

@@ -1,15 +0,0 @@
-diff -Naur cfitsio-4.3.0.old/fitsio2.h cfitsio-4.3.0/fitsio2.h
---- cfitsio-4.3.0.old/fitsio2.h	2024-06-09 10:46:21.767372554 +0800
-+++ cfitsio-4.3.0/fitsio2.h	2024-06-09 10:49:47.585360286 +0800
-@@ -137,6 +137,11 @@
- #    error "can't handle long size given by _MIPS_SZLONG"
- #  endif
- 
-+#elif defined(__loongarch64) || defined(__loongarch64__)
-+#define BYTESWAPPED TRUE
-+#define MACHINE OTHERTYPE
-+#define LONGSIZE 64
-+
- #elif defined(__riscv)
- 
- /* RISC-V is always little endian */

cfitsio-ldflags.patch

@@ -1,12 +1,14 @@
-diff -Naur cfitsio-4.2.0/configure cfitsio-4.2.0.ldflags/configure
+diff -Naur cfitsio/configure cfitsio.ldflags/configure
---- cfitsio-4.2.0/configure	2022-10-31 19:40:23.000000000 +0100
+--- cfitsio/configure	2018-05-09 21:16:00.000000000 +0200
-+++ cfitsio-4.2.0.ldflags/configure	2022-11-25 10:05:55.387220762 +0100
++++ cfitsio.ldflags/configure	2018-05-23 17:17:18.452431657 +0200
-@@ -4670,7 +4670,7 @@
+@@ -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
  
 -LDFLAGS="$CFLAGS"
+-LDFLAGS_BIN="$LDFLAGS"
 +# LDFLAGS="$CFLAGS"
- LDFLAGS_BIN="$LDFLAGS"
++LDFLAGS_BIN="$CFLAGS"
  
  if test "x$FC" = "xnone" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5

cfitsio-pkgconfig.patch

@@ -1,7 +1,7 @@
-diff -ur cfitsio-4.0.0/cfitsio.pc.in cfitsio-4.0.0.pc/cfitsio.pc.in
+diff -ur cfitsio/cfitsio.pc.in cfitsio.new/cfitsio.pc.in
---- cfitsio-4.0.0/cfitsio.pc.in	2021-05-20 03:18:54.000000000 +0200
+--- cfitsio/cfitsio.pc.in	2013-04-08 20:11:56.000000000 +0200
-+++ cfitsio-4.0.0.pc/cfitsio.pc.in	2021-12-03 17:38:32.302407819 +0100
++++ cfitsio.new/cfitsio.pc.in	2013-07-10 18:42:11.105358864 +0200
-@@ -1,7 +1,7 @@
+@@ -1,11 +1,11 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
@@ -10,3 +10,10 @@ diff -ur cfitsio-4.0.0/cfitsio.pc.in cfitsio-4.0.0.pc/cfitsio.pc.in
  
  Name: cfitsio
  Description: FITS File Subroutine Library
+ Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@
+-Libs: -L${libdir} -lcfitsio @LIBS@
+-Libs.private: -lm
+-Cflags: -I${includedir}
++Libs: -L${libdir} -lcfitsio
++Libs.private: -lm -lz @LIBS@
++Cflags: -D_REENTRANT -I${includedir}

cfitsio-zlib.patch

@@ -0,0 +1,60 @@
+diff -Naur cfitsio/Makefile.in cfitsio.zlib/Makefile.in
+--- cfitsio/Makefile.in	2018-05-09 21:16:01.000000000 +0200
++++ cfitsio.zlib/Makefile.in	2018-05-23 13:54:43.878032943 +0200
+@@ -67,9 +67,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@
+ 
+@@ -102,7 +100,7 @@
+ shared: lib${PACKAGE}${SHLIB_SUFFIX}
+ 
+ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
+-		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS}
++		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS}
+ 		@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
+ 			ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
+ 			ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
+@@ -139,28 +137,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

cfitsio.spec

@@ -1,17 +1,17 @@
 Name:              cfitsio
-Version:           4.3.0
+Version:           3.450
-Release:           2
+Release:           5
 Summary:           Library for manipulating FITS data files
 License:           MIT
 URL:               http://heasarc.gsfc.nasa.gov/fitsio/
-Source0:           http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-%{version}.tar.gz
+Source0:           https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3450.tar.gz
 
+Patch0000:         cfitsio-zlib.patch
 Patch0001:         cfitsio-noversioncheck.patch
 Patch0002:         cfitsio-pkgconfig.patch
 Patch0003:         cfitsio-ldflags.patch
-Patch0004:         add-support-for-loongarch64.patch
 
-BuildRequires:     gcc-gfortran zlib-devel bzip2-devel chrpath curl-devel make
+BuildRequires:     gcc-gfortran zlib-devel bzip2-devel
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 
@@ -62,12 +62,11 @@ a higher compression rate than lossless techniques
 to the accuracy in the original image) depends on the amount of compression
 
 %prep
-%autosetup  -n %{name}-%{version} -p1
+%autosetup  -n cfitsio -p1
-
+cd zlib
-# fix funpack/fpack -V
+rm adler32.c crc32.c deflate.c infback.c inffast.c inflate.c inflate.h inftrees.c inftrees.h zlib.h \
-sed -i 's/float version;/char* version = "%{version}";/g' fpackutil.c
+deflate.h trees.c trees.h uncompr.c zconf.h zutil.c zutil.h crc32.h  inffast.h  inffixed.h 
-sed -i '/fits_get_version(&version);/d' fpackutil.c
+cd -
-sed -i 's/%5.3f"/%s"/g' fpackutil.c
 
 %build
 %configure --enable-reentrant --with-bzip2
@@ -82,17 +81,17 @@ cmp -s testprog.lis testprog.out
 cmp -s testprog.fit testprog.std
 
 %install
-%make_install LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}/%{name} \
+install -d %{buildroot}%{_bindir}
- CFITSIO_LIB=%{buildroot}%{_libdir} \
+install -d %{buildroot}%{_libdir}
- CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name}
+install -d %{buildroot}%{_includedir}/%{name}
-
+make LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}/%{name} CFITSIO_LIB=%{buildroot}%{_libdir} \
+ CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} \
+install
 cp -p f{,un}pack %{buildroot}%{_bindir}
 
 chmod 755 %{buildroot}%{_libdir}/libcfitsio.so.*
 chmod 755 %{buildroot}%{_bindir}/f{,un}pack
 
-chrpath -d %{buildroot}%{_bindir}/f{,un}pack
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -118,18 +117,6 @@ chrpath -d %{buildroot}%{_bindir}/f{,un}pack
 %{_bindir}/funpack
 
 %changelog
-* Sun Jun 9 2024 zhangxianjun <zhangxianjun@kylinos.cn> - 4.3.0-2
-- add support for loongarch64
-
-* 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
-
-* Wed Feb 09 2022 yaoxin <yaoxin30@huawei.com> - 3.490-1
-- Upgrade cfitsio to 3.490 to fix CVE-2018-3848,CVE-2018-3849
-
 * Mon Mar 09 2020 yangjian<yangjian79@huawei.com> - 3.450-5
 - Fix changelog  problem
 

cfitsio.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: healpy/cfitsio
-tag_prefix: ""
-separator: "."