diff --git a/.gitignore b/.gitignore index 0d2d139..191ef25 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ cfitsio3250.tar.gz /cfitsio3420.tar.gz /cfitsio3430.tar.gz /cfitsio3450.tar.gz +/cfitsio-3.47.tar.gz diff --git a/cfitsio-3.47-soname.patch b/cfitsio-3.47-soname.patch new file mode 100644 index 0000000..90fdf4e --- /dev/null +++ b/cfitsio-3.47-soname.patch @@ -0,0 +1,36 @@ +diff -ur cfitsio-3.47/configure cfitsio-3.47.soname/configure +--- cfitsio-3.47/configure 2019-08-01 15:59:50.735018203 +0200 ++++ cfitsio-3.47.soname/configure 2019-08-01 16:04:16.277042668 +0200 +@@ -2293,7 +2293,7 @@ + CFITSIO_MINOR=47 + + # Increment soname each time the interface changes: +-CFITSIO_SONAME=8 ++CFITSIO_SONAME=7 + + + #-------------------------------------------------------------------- +diff -ur cfitsio-3.47/configure.in cfitsio-3.47.soname/configure.in +--- cfitsio-3.47/configure.in 2019-05-21 21:42:37.000000000 +0200 ++++ cfitsio-3.47.soname/configure.in 2019-08-01 16:03:15.723124934 +0200 +@@ -17,7 +17,7 @@ + AC_SUBST(CFITSIO_MAJOR,3) + AC_SUBST(CFITSIO_MINOR,47) + # Increment soname each time the interface changes: +-AC_SUBST(CFITSIO_SONAME,8) ++AC_SUBST(CFITSIO_SONAME,7) + + #-------------------------------------------------------------------- + # Command options +diff -ur cfitsio-3.47/fitsio.h cfitsio-3.47.soname/fitsio.h +--- cfitsio-3.47/fitsio.h 2019-05-08 17:34:50.000000000 +0200 ++++ cfitsio-3.47.soname/fitsio.h 2019-08-01 16:05:22.684049113 +0200 +@@ -37,7 +37,7 @@ + #define CFITSIO_VERSION 3.47 + #define CFITSIO_MINOR 47 + #define CFITSIO_MAJOR 3 +-#define CFITSIO_SONAME 8 ++#define CFITSIO_SONAME 7 + + /* the SONAME is incremented in a new release if the binary shared */ + /* library (on linux and Mac systems) is not backward compatible */ diff --git a/cfitsio-pkgconfig.patch b/cfitsio-pkgconfig.patch index c8e81da..17e87cc 100644 --- a/cfitsio-pkgconfig.patch +++ b/cfitsio-pkgconfig.patch @@ -1,7 +1,7 @@ -diff -ur cfitsio/cfitsio.pc.in cfitsio.new/cfitsio.pc.in ---- cfitsio/cfitsio.pc.in 2013-04-08 20:11:56.000000000 +0200 -+++ cfitsio.new/cfitsio.pc.in 2013-07-10 18:42:11.105358864 +0200 -@@ -1,11 +1,11 @@ +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 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ @@ -10,6 +10,7 @@ diff -ur cfitsio/cfitsio.pc.in cfitsio.new/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@ -Libs.private: -lm diff --git a/cfitsio-sformat.patch b/cfitsio-sformat.patch new file mode 100644 index 0000000..8255e34 --- /dev/null +++ b/cfitsio-sformat.patch @@ -0,0 +1,35 @@ +diff -ur cfitsio-3.47/drvrnet.c cfitsio-3.47.sformat/drvrnet.c +--- cfitsio-3.47/drvrnet.c 2019-05-21 21:41:54.000000000 +0200 ++++ cfitsio-3.47.sformat/drvrnet.c 2019-08-01 13:52:41.461958938 +0200 +@@ -1257,9 +1257,9 @@ + urlname = (char *)clientp; + if (urlname) + { +- fprintf(stderr,"Downloading "); +- fprintf(stderr,urlname); +- fprintf(stderr,"...\n"); ++ fprintf(stderr,"%s","Downloading "); ++ fprintf(stderr,"%s",urlname); ++ fprintf(stderr,"%s","...\n"); + } + isFirst = 0; + } +@@ -1270,13 +1270,13 @@ + nToDisplay = fullBar; + fprintf(stderr,"%3d%% [",percent); + for (i=0; i - 3.470-1 +- Update to 3.470 +- Patch to revert bogus soname increase +- Patch to fix fprintf format errors + * Wed Jul 24 2019 Fedora Release Engineering - 3.450-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 3f453cd..422eee5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cfitsio3450.tar.gz) = f553f9bbedc3ffabf939bb507d3c41d6dc0d889b3a0835c23a7aff90ba98d7f9a6217527d69bc8984ce9bd9664681baeec5b1555d2ab51aaca003fdb5a08127e +SHA512 (cfitsio-3.47.tar.gz) = c0502699e266928dd25abe57730dc4b357ccc9023789fe745324ae01aa688516aceaf37321ee578f0430111d9718f0fec0dc5b54c07f935529560f00b32ce1e3