From 5d88a088af0bf0ffada717d384ba10f143a9569c Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr@fedoraproject.org>
Date: May 23 2018 15:31:28 +0000
Subject: Update to 3.450 (fixes bz #1570484)

Patch to use LDFLAGS (fixes bz #1547590)

---

diff --git a/.gitignore b/.gitignore
index 8940721..0d2d139 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ cfitsio3250.tar.gz
 /cfitsio3370.tar.gz
 /cfitsio3420.tar.gz
 /cfitsio3430.tar.gz
+/cfitsio3450.tar.gz
diff --git a/cfitsio-ldflags.patch b/cfitsio-ldflags.patch
new file mode 100644
index 0000000..4495d46
--- /dev/null
+++ b/cfitsio-ldflags.patch
@@ -0,0 +1,14 @@
+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
+ 
+-LDFLAGS="$CFLAGS"
+-LDFLAGS_BIN="$LDFLAGS"
++# LDFLAGS="$CFLAGS"
++LDFLAGS_BIN="$CFLAGS"
+ 
+ if test "x$FC" = "xnone" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5
diff --git a/cfitsio-zlib.patch b/cfitsio-zlib.patch
index 289a65d..ec9c7ff 100644
--- a/cfitsio-zlib.patch
+++ b/cfitsio-zlib.patch
@@ -1,9 +1,9 @@
 diff -Naur cfitsio/Makefile.in cfitsio.zlib/Makefile.in
---- cfitsio/Makefile.in	2017-09-20 21:40:40.000000000 +0200
-+++ cfitsio.zlib/Makefile.in	2018-02-23 14:36:44.439214375 +0100
-@@ -68,9 +68,7 @@
+--- 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
+ 		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 \
@@ -12,7 +12,7 @@ diff -Naur cfitsio/Makefile.in cfitsio.zlib/Makefile.in
  
  SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
  
-@@ -103,7 +101,7 @@
+@@ -102,7 +100,7 @@
  shared: lib${PACKAGE}${SHLIB_SUFFIX}
  
  lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
@@ -21,7 +21,7 @@ diff -Naur cfitsio/Makefile.in cfitsio.zlib/Makefile.in
  		@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
  			ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
  			ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
-@@ -140,28 +138,28 @@
+@@ -139,28 +137,28 @@
  		${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
  
  smem:		smem.o lib${PACKAGE}.a ${OBJECTS}
diff --git a/cfitsio.spec b/cfitsio.spec
index 4794546..f64998e 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,17 +1,19 @@
 Name: cfitsio
-Version: 3.430
+Version: 3.450
 Release: 1%{?dist}
 Summary: Library for manipulating FITS data files
 
 License: MIT
 URL: http://heasarc.gsfc.nasa.gov/fitsio/
-Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3430.tar.gz
+Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3450.tar.gz
 # Unbundles zlib
 Patch0: cfitsio-zlib.patch
 # Remove soname version check
 Patch1: cfitsio-noversioncheck.patch
 # Some rearrangements in pkg-config file
 Patch2: cfitsio-pkgconfig.patch
+# Use builder linker flags
+Patch3: cfitsio-ldflags.patch
 
 BuildRequires:     gcc-gfortran zlib-devel
 BuildRequires:     bzip2-devel
@@ -80,6 +82,7 @@ compression algorithm.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # remove bundled zlib
 # not all the files inside zlib belong to zlib
@@ -142,6 +145,10 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
 %{_bindir}/funpack
 
 %changelog
+* Wed May 23 2018 Sergio Pascual <sergiopr@fedoraproject.org> - 3.450-1
+- Update to 3.450 (fixes bz #1570484)
+- Patch to use LDFLAGS (fixes bz #1547590)
+
 * Mon Mar 12 2018 Christian Dersch <lupinix@fedoraproject.org> - 3.430-1
 - new version
 
diff --git a/sources b/sources
index 437da7f..3f453cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cfitsio3430.tar.gz) = b8b02e2170b5f8f9b55529a9294be0f501aa00562f268c13a6559d937675dd1b8875ff83f6da71ba1427b6cbf8d6af86476fafb9fb08523efa55f999a9ff72c9
+SHA512 (cfitsio3450.tar.gz) = f553f9bbedc3ffabf939bb507d3c41d6dc0d889b3a0835c23a7aff90ba98d7f9a6217527d69bc8984ce9bd9664681baeec5b1555d2ab51aaca003fdb5a08127e