Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/lpsolve.git#e61c95849012f375a006c2f2469c6f0e06af3ef2
This commit is contained in:
DistroBaker 2021-02-02 13:35:58 +00:00
parent 3d5726a2fd
commit baededccf2
2 changed files with 28 additions and 1 deletions

View File

@ -1,7 +1,7 @@
Name: lpsolve
Summary: A Mixed Integer Linear Programming (MILP) solver
Version: 5.5.2.0
Release: 25%{?dist}
Release: 26%{?dist}
Source: http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz
URL: http://sourceforge.net/projects/lpsolve
License: LGPLv2+
@ -10,6 +10,7 @@ BuildRequires: gcc-c++
Patch0: lpsolve-5.5.0.11.cflags.patch
Patch1: lpsolve-5.5.2.0.defines.patch
Patch2: read-cc-from-env.patch
%description
Mixed Integer Linear Programming (MILP) solver lpsolve solves pure linear,
@ -26,6 +27,7 @@ Includes and definitions for developing with lpsolve
%setup -q -n lp_solve_5.5
%patch0 -p1 -b .cflags.patch
%patch1 -p1 -b .defines.patch
%patch2 -p1 -b .cc-from-env.patch
%build
%set_build_flags
@ -56,6 +58,9 @@ install -p -m 644 \
%{_includedir}/lpsolve
%changelog
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.2.0-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.2.0-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

22
read-cc-from-env.patch Normal file
View File

@ -0,0 +1,22 @@
diff -ruN lp_solve_5.5.orig/lp_solve/ccc lp_solve_5.5/lp_solve/ccc
--- lp_solve_5.5.orig/lp_solve/ccc 2020-12-08 12:24:15.118953722 +0100
+++ lp_solve_5.5/lp_solve/ccc 2020-12-08 12:49:39.661428497 +0100
@@ -1,6 +1,6 @@
:
src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c lp_solve.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
+c=$CC
#determine platform (32/64 bit)
>/tmp/platform.c
diff -ruN lp_solve_5.5.orig/lpsolve55/ccc lp_solve_5.5/lpsolve55/ccc
--- lp_solve_5.5.orig/lpsolve55/ccc 2020-12-08 12:24:15.118953722 +0100
+++ lp_solve_5.5/lpsolve55/ccc 2020-12-08 12:40:22.677752522 +0100
@@ -1,6 +1,6 @@
:
src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
+c=$CC
#determine platform (32/64 bit)
>/tmp/platform.c