Update to latest upstream release (#1257923)

This commit is contained in:
pcpa 2015-09-25 19:53:16 -03:00
parent 0710d24d1d
commit ac35bd2d2a
4 changed files with 8 additions and 20 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/Clp-1.16.1.tgz
/Clp-1.16.3.tgz
/Clp-1.16.6.tgz
/Clp-1.16.8.tgz

View File

@ -1,12 +0,0 @@
diff -up Clp-1.16.6/src/CbcOrClpParam.cpp.orig Clp-1.16.6/src/CbcOrClpParam.cpp
--- Clp-1.16.6/src/CbcOrClpParam.cpp.orig 2015-06-21 18:26:14.891917826 -0300
+++ Clp-1.16.6/src/CbcOrClpParam.cpp 2015-06-21 18:26:26.561918565 -0300
@@ -48,7 +48,7 @@ static char coin_prompt[] = "Clp:";
#include "AbcCommon.hpp"
#endif
static bool doPrinting = true;
-std::string afterEquals = "";
+static std::string afterEquals = "";
static char printArray[200];
#if COIN_INT_MAX==0
#undef COIN_INT_MAX

View File

@ -3,8 +3,8 @@
Name: coin-or-%{module}
Group: Applications/Engineering
Summary: Coin-or linear programming
Version: 1.16.6
Release: 5%{?dist}
Version: 1.16.8
Release: 1%{?dist}
License: EPL
URL: http://projects.coin-or.org/%{module}
Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz
@ -24,10 +24,6 @@ BuildRequires: zlib-devel
# Install documentation in standard rpm directory
Patch0: %{name}-docdir.patch
# Correct crash on coin-or-OS %%check
# This patch will be in next Clp release
Patch1: %{name}-string.patch
%description
Clp (Coin-or linear programming) is an open-source linear programming
solver written in C++. It is primarily meant to be used as a callable
@ -55,7 +51,6 @@ This package contains the documentation for %{name}.
%prep
%setup -q -n %{module}-%{version}
%patch0 -p1
%patch1 -p1
%build
%configure
@ -94,6 +89,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test
%doc %{_docdir}/%{name}/html
%changelog
* Fri Sep 25 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.16.8-1
- Update to latest upstream release (#1257923)
- Remove no longer needed patch to prevent coin-or-OS crash in %%check
* Mon Jun 22 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.16.6-5
- Correct crash on coin-or-OS check

View File

@ -1 +1 @@
58dacffe4fcdf47b199d4465b3a4f233 Clp-1.16.6.tgz
e4abb6038698bb42823dbbc5bb4d2725 Clp-1.16.8.tgz