From c484294fd6c9a69b0bf69c0b04227a503d8cbd6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 15 Feb 2016 09:56:30 +0000 Subject: [PATCH] Resolves: rhbz#1307751 FTBFS --- lpsolve-5.5.2.0.defines.patch | 22 ++++++++++++++++++++++ lpsolve.spec | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 lpsolve-5.5.2.0.defines.patch diff --git a/lpsolve-5.5.2.0.defines.patch b/lpsolve-5.5.2.0.defines.patch new file mode 100644 index 0000000..a325c13 --- /dev/null +++ b/lpsolve-5.5.2.0.defines.patch @@ -0,0 +1,22 @@ +--- lp_solve_5.5/lpsolve55/ccc ++++ lp_solve_5.5/lpsolve55/ccc +@@ -18,7 +18,7 @@ + echo '#include '>>/tmp/isnan.c + echo '#include '>>/tmp/isnan.c + echo '#include '>>/tmp/isnan.c +-echo 'main(){isnan(0);}'>>/tmp/isnan.c ++echo 'main(){isnan(0.0);}'>>/tmp/isnan.c + $c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1 + if [ $? = 0 ] + then NOISNAN= +--- lp_solve_5.5/lp_solve/ccc ++++ lp_solve_5.5/lp_solve/ccc +@@ -20,7 +20,7 @@ + echo '#include '>>/tmp/isnan.c + echo '#include '>>/tmp/isnan.c + echo '#include '>>/tmp/isnan.c +-echo 'main(){isnan(0);}'>>/tmp/isnan.c ++echo 'main(){isnan(0.0);}'>>/tmp/isnan.c + $c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1 + if [ $? = 0 ] + then NOISNAN= diff --git a/lpsolve.spec b/lpsolve.spec index 77e484d..80fb640 100644 --- a/lpsolve.spec +++ b/lpsolve.spec @@ -1,7 +1,7 @@ Name: lpsolve Summary: A Mixed Integer Linear Programming (MILP) solver Version: 5.5.2.0 -Release: 12%{?dist} +Release: 13%{?dist} Source: http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz Group: System Environment/Libraries URL: http://sourceforge.net/projects/lpsolve @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPLv2+ Patch0: lpsolve-5.5.0.11.cflags.patch +Patch1: lpsolve-5.5.2.0.defines.patch %description Mixed Integer Linear Programming (MILP) solver lpsolve solves pure linear, @@ -25,6 +26,7 @@ Includes and definitions for developing with lpsolve %prep %setup -q -n lp_solve_5.5 %patch0 -p1 -b .cflags.patch +%patch1 -p1 -b .defines.patch #sparc and s390 need -fPIC lets sed it %ifarch sparcv9 sparc64 s390 s390x sed -i -e 's|-fpic|-fPIC|g' lpsolve55/ccc @@ -65,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/lpsolve %changelog +* Mon Feb 15 2016 Caolán McNamara - 5.5.2.0-13 +- Resolves: rhbz#1307751 FTBFS + * Thu Feb 04 2016 Fedora Release Engineering - 5.5.2.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild