diff --git a/lpsolve-5.5.0.11.cflags.patch b/lpsolve-5.5.0.11.cflags.patch index 7bc0f0f..5185626 100644 --- a/lpsolve-5.5.0.11.cflags.patch +++ b/lpsolve-5.5.0.11.cflags.patch @@ -1,4 +1,4 @@ ---- lp_solve_5.5/lpsolve55/ccc.orig 2018-02-26 09:27:51.074682302 +0000 +--- lp_solve_5.5/lpsolve55/ccc 2018-02-26 09:27:51.074682302 +0000 +++ lp_solve_5.5/lpsolve55/ccc 2018-02-26 09:36:36.329990782 +0000 @@ -35,16 +35,14 @@ so=y @@ -20,3 +20,20 @@ fi rm *.o 2>/dev/null +--- lp_solve_5.5/lp_solve/ccc 2018-02-26 14:32:54.304981484 +0000 ++++ lp_solve_5.5/lp_solve/ccc 2018-02-26 14:34:03.524750992 +0000 +@@ -28,8 +28,6 @@ + fi + rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1 + +-opts='-O3' +- + def= + if [ "$PLATFORM" = "SCO_UNIX" ] + then opts='-O0' +@@ -38,4 +36,4 @@ + else dl=-ldl + fi + +-$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $dl ++$c $CFLAGS -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $dl diff --git a/lpsolve.spec b/lpsolve.spec index cdeea9a..17a8890 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: 18%{?dist} +Release: 19%{?dist} Source: http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz Group: System Environment/Libraries URL: http://sourceforge.net/projects/lpsolve @@ -60,6 +60,9 @@ install -p -m 644 \ %{_includedir}/lpsolve %changelog +* Mon Feb 26 2018 Caolán McNamara - 5.5.2.0-19 +- Resolves: rhbz#1548689 there are two build scripts that need adjusting + * Mon Feb 26 2018 Caolán McNamara - 5.5.2.0-18 - Resolves: rhbz#1548689 use fedora compile/link flags