diff --git a/cfitsio-ldflags.patch b/cfitsio-ldflags.patch index 4495d46..24af149 100644 --- a/cfitsio-ldflags.patch +++ b/cfitsio-ldflags.patch @@ -1,7 +1,7 @@ -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 @@ +diff -up cfitsio-4.1.0/configure.ldflags cfitsio-4.1.0/configure +--- cfitsio-4.1.0/configure.ldflags 2022-08-23 21:19:59.893242099 -0600 ++++ cfitsio-4.1.0/configure 2022-08-23 21:20:12.986361691 -0600 +@@ -4644,8 +4644,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -11,4 +11,4 @@ diff -Naur cfitsio/configure cfitsio.ldflags/configure +LDFLAGS_BIN="$CFLAGS" if test "x$FC" = "xnone" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5 diff --git a/cfitsio-remove-rpath.patch b/cfitsio-remove-rpath.patch index a8cee6b..2295884 100644 --- a/cfitsio-remove-rpath.patch +++ b/cfitsio-remove-rpath.patch @@ -1,12 +1,12 @@ -diff -ur cfitsio-3.49/configure cfitsio-3.49.rpath/configure ---- cfitsio-3.49/configure 2021-08-01 10:11:12.159237384 +0200 -+++ cfitsio-3.49.rpath/configure 2021-08-01 10:24:32.504218725 +0200 -@@ -4673,7 +4673,7 @@ - $as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h +diff -up cfitsio-4.1.0/configure.rpath cfitsio-4.1.0/configure +--- cfitsio-4.1.0/configure.rpath 2022-08-23 21:21:35.166112312 -0600 ++++ cfitsio-4.1.0/configure 2022-08-23 21:35:59.586014956 -0600 +@@ -5036,7 +5036,7 @@ case $host in + printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h # LDFLAGS used by utilities: - LDFLAGS_BIN="$LDFLAGS_BIN -Wl,-rpath,\${CFITSIO_LIB}" + LDFLAGS_BIN="$LDFLAGS_BIN" ;; *mingw32*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for large file support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for large file support" >&5 diff --git a/cfitsio.spec b/cfitsio.spec index a963fc3..94984f2 100644 --- a/cfitsio.spec +++ b/cfitsio.spec @@ -1,6 +1,6 @@ Name: cfitsio -Version: 4.0.0 -Release: 3%{?dist} +Version: 4.1.0 +Release: 1%{?dist} Summary: Library for manipulating FITS data files License: MIT @@ -78,8 +78,8 @@ compression algorithm. %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%patch3 -p1 -b .ldflags +%patch4 -p1 -b .rpath %build %configure --enable-reentrant -with-bzip2 @@ -131,6 +131,9 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack %{_bindir}/funpack %changelog +* Wed Aug 24 2022 Orion Poplawski - 4.1.0-1 +- Update to 4.1.0 + * Wed Jul 20 2022 Fedora Release Engineering - 4.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild