From 3802d87293bac3e35ea0bbefd98ad4637d1032ef Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Date: Apr 14 2018 09:54:15 +0000 Subject: Use standard Fedora linker flags - Resolves #1547590 Signed-off-by: Rafael dos Santos --- diff --git a/cfitsio-ldflags.patch b/cfitsio-ldflags.patch new file mode 100644 index 0000000..a9605fe --- /dev/null +++ b/cfitsio-ldflags.patch @@ -0,0 +1,10 @@ +--- cfitsio/configure 2018-03-01 17:28:51.000000000 +0100 ++++ cfitsio/configure 2018-04-14 11:49:23.907135099 +0200 +@@ -4166,7 +4166,6 @@ + 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" + + if test "x$FC" = "xnone" ; then diff --git a/cfitsio.spec b/cfitsio.spec index 4794546..3cda35a 100644 --- a/cfitsio.spec +++ b/cfitsio.spec @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.430 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for manipulating FITS data files License: MIT @@ -12,6 +12,8 @@ Patch0: cfitsio-zlib.patch Patch1: cfitsio-noversioncheck.patch # Some rearrangements in pkg-config file Patch2: cfitsio-pkgconfig.patch +# Do not override ldflags content with cflags +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,9 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack %{_bindir}/funpack %changelog +* Sat Apr 14 2018 Rafael dos Santos - 3.430-2 +- Use standard Fedora linker flags (bug #1547590) + * Mon Mar 12 2018 Christian Dersch - 3.430-1 - new version