Compare commits

..

No commits in common. "c8s" and "c9s" have entirely different histories.
c8s ... c9s

6 changed files with 56 additions and 15 deletions

3
.gitignore vendored
View File

@ -1,2 +1 @@
SOURCES/lp_solve_5.5.2.0_source.tar.gz lp_solve_5.5.2.0_source.tar.gz
/lp_solve_5.5.2.0_source.tar.gz

1
.lpsolve.metadata Normal file
View File

@ -0,0 +1 @@
e2830053cf079839b9ce21662cbc886ac6d31c80 lp_solve_5.5.2.0_source.tar.gz

View File

@ -1,7 +1,6 @@
--- !Policy --- !Policy
product_versions: product_versions:
- rhel-8 - rhel-9
decision_context: osci_compose_gate decision_context: osci_compose_gate
rules: rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -1,14 +1,16 @@
Name: lpsolve Name: lpsolve
Summary: A Mixed Integer Linear Programming (MILP) solver Summary: A Mixed Integer Linear Programming (MILP) solver
Version: 5.5.2.0 Version: 5.5.2.0
Release: 21%{?dist} Release: 28%{?dist}
Source: http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz Source: http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz
Group: System Environment/Libraries
URL: http://sourceforge.net/projects/lpsolve URL: http://sourceforge.net/projects/lpsolve
License: LGPLv2+ License: LGPLv2+
BuildRequires: gcc-c++
Patch0: lpsolve-5.5.0.11.cflags.patch Patch0: lpsolve-5.5.0.11.cflags.patch
Patch1: lpsolve-5.5.2.0.defines.patch Patch1: lpsolve-5.5.2.0.defines.patch
Patch2: read-cc-from-env.patch
%description %description
Mixed Integer Linear Programming (MILP) solver lpsolve solves pure linear, Mixed Integer Linear Programming (MILP) solver lpsolve solves pure linear,
@ -17,7 +19,6 @@ Mixed Integer Linear Programming (MILP) solver lpsolve solves pure linear,
%package devel %package devel
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Summary: Files for developing with lpsolve Summary: Files for developing with lpsolve
Group: Development/Libraries
%description devel %description devel
Includes and definitions for developing with lpsolve Includes and definitions for developing with lpsolve
@ -26,6 +27,7 @@ Includes and definitions for developing with lpsolve
%setup -q -n lp_solve_5.5 %setup -q -n lp_solve_5.5
%patch0 -p1 -b .cflags.patch %patch0 -p1 -b .cflags.patch
%patch1 -p1 -b .defines.patch %patch1 -p1 -b .defines.patch
%patch2 -p1 -b .cc-from-env.patch
%build %build
%set_build_flags %set_build_flags
@ -45,23 +47,41 @@ install -p -m 755 \
install -p -m 644 \ install -p -m 644 \
lp*.h $RPM_BUILD_ROOT%{_includedir}/lpsolve lp*.h $RPM_BUILD_ROOT%{_includedir}/lpsolve
%post -p /sbin/ldconfig %ldconfig_scriptlets
%postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root,-)
%doc README.txt ./bfp/bfp_LUSOL/LUSOL/LUSOL_LGPL.txt ./bfp/bfp_LUSOL/LUSOL/LUSOL_README.txt ./bfp/bfp_LUSOL/LUSOL/LUSOL-overview.txt %doc README.txt ./bfp/bfp_LUSOL/LUSOL/LUSOL_LGPL.txt ./bfp/bfp_LUSOL/LUSOL/LUSOL_README.txt ./bfp/bfp_LUSOL/LUSOL/LUSOL-overview.txt
%{_bindir}/lp_solve %{_bindir}/lp_solve
%{_libdir}/*.so %{_libdir}/*.so
%files devel %files devel
%defattr(-,root,root,-)
%{_includedir}/lpsolve %{_includedir}/lpsolve
%changelog %changelog
* Wed Jun 30 2021 Caolán McNamara <caolanm@redhat.com> - 5.5.2.0-21 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.5.2.0-28
- Resolves: rhbz#1975269 bump n-v-r - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.5.2.0-27
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* 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
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.2.0-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.2.0-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.2.0-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.2.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Feb 26 2018 Caolán McNamara <caolanm@redhat.com> - 5.5.2.0-20 * Mon Feb 26 2018 Caolán McNamara <caolanm@redhat.com> - 5.5.2.0-20
- Related: rhbz#1548689 ... and LDFLAGS - Related: rhbz#1548689 ... and LDFLAGS

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

View File

@ -1 +1 @@
SHA512 (lp_solve_5.5.2.0_source.tar.gz) = 8a22a1c6b7ab8f3ea198f0383f543b697110caa6e43e402490357fd0cefd777443e16b65a5c20965c78b151f11acdb5b9d089c5219b0f262d04fb74311094c7e 167c0fb4ab178e0b7ab50bf0a635a836 lp_solve_5.5.2.0_source.tar.gz