From 3ef65c69640de5aaac20cc0af5de9addf3b569c6625778f7005d525f13f04aee Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Wed, 27 Jun 2018 14:05:10 +0000
Subject: [PATCH] - Update to version 4.65:   * The following new API routines
 for LP/MIP preprocessing were added:     + glp_npp_alloc_wksp    allocate the
 preprocessor workspace     + glp_npp_load_prob     load original problem
 instance     + glp_npp_preprocess1   perform basic LP/MIP preprocessing     +
 glp_npp_build_prob    build resultant problem instance     +
 glp_npp_postprocess   postprocess solution to resultant problem     +
 glp_npp_obtain_sol    obtain solution to original problem     +
 glp_npp_free_wksp     free the preprocessor workspace   * A new, more robust
 implementation of locally valid simple cover     cuts was included in the MIP
 solver.   * The API routine glp_init_iocp was changed to enable long-step    
 option of the dual simplex by default. - Add glpk-no_random_return.patch

OBS-URL: https://build.opensuse.org/package/show/science/glpk?expand=0&rev=42
---
 glpk-4.64.tar.gz            |   3 ---
 glpk-4.64.tar.gz.sig        | Bin 65 -> 0 bytes
 glpk-4.65.tar.gz            |   3 +++
 glpk-4.65.tar.gz.sig        | Bin 0 -> 65 bytes
 glpk-no_random_return.patch |  20 ++++++++++++++++++++
 glpk.changes                |  18 ++++++++++++++++++
 glpk.spec                   |  10 ++++++----
 7 files changed, 47 insertions(+), 7 deletions(-)
 delete mode 100644 glpk-4.64.tar.gz
 delete mode 100644 glpk-4.64.tar.gz.sig
 create mode 100644 glpk-4.65.tar.gz
 create mode 100644 glpk-4.65.tar.gz.sig
 create mode 100644 glpk-no_random_return.patch

diff --git a/glpk-4.64.tar.gz b/glpk-4.64.tar.gz
deleted file mode 100644
index be7de2e..0000000
--- a/glpk-4.64.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:539267f40ea3e09c3b76a31c8747f559e8a097ec0cda8f1a3778eec3e4c3cc24
-size 4143259
diff --git a/glpk-4.64.tar.gz.sig b/glpk-4.64.tar.gz.sig
deleted file mode 100644
index 0c71cb686226af402d3bb5f579aa725d76c09dec66720e601f99c0550adce8b3..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65
zcmV-H0KWf-KLZ5-S|V)+(R=bRS%K&n5d!{50HBu@s*D1<$K%7cwEtlY`KjSSQmg=<
XO11VSG?tWm3vNsFIuR<j_9qIeiGCdG

diff --git a/glpk-4.65.tar.gz b/glpk-4.65.tar.gz
new file mode 100644
index 0000000..1e4385b
--- /dev/null
+++ b/glpk-4.65.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4281e29b628864dfe48d393a7bedd781e5b475387c20d8b0158f329994721a10
+size 4167110
diff --git a/glpk-4.65.tar.gz.sig b/glpk-4.65.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..789922c3508c9d8f788228061575522b2a046a08d0a74895c93943712c759bd8
GIT binary patch
literal 65
zcmV-H0KWf-KLZ5-T85s~(R=bRS%K&n5d!D<0G$*M$Q2jCmyT~WZ1d!rWOL~F0(StP
Xc+*Bu0U10TqYZlVXKzO6vCySupHdw~

literal 0
HcmV?d00001

diff --git a/glpk-no_random_return.patch b/glpk-no_random_return.patch
new file mode 100644
index 0000000..71c9019
--- /dev/null
+++ b/glpk-no_random_return.patch
@@ -0,0 +1,20 @@
+Index: glpk-4.65/src/draft/glpios01.c
+===================================================================
+--- glpk-4.65.orig/src/draft/glpios01.c
++++ glpk-4.65/src/draft/glpios01.c
+@@ -1491,6 +1491,7 @@ int ios_add_row(glp_tree *tree, IOSPOOL
+ IOSCUT *ios_find_row(IOSPOOL *pool, int i)
+ {     /* find row (constraint) in the cut pool */
+       xassert(0);
++      return;
+ }
+ #else
+ IOSCUT *ios_find_row(IOSPOOL *pool, int i)
+@@ -1550,6 +1551,7 @@ IOSCUT *ios_find_row(IOSPOOL *pool, int
+ void ios_del_row(glp_tree *tree, IOSPOOL *pool, int i)
+ {     /* remove row (constraint) from the cut pool */
+       xassert(0);
++      return;
+ }
+ #else
+ void ios_del_row(glp_tree *tree, IOSPOOL *pool, int i)
diff --git a/glpk.changes b/glpk.changes
index 2d5b14a..50fc49f 100644
--- a/glpk.changes
+++ b/glpk.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Jun 27 13:50:37 UTC 2018 - mpluskal@suse.com
+
+- Update to version 4.65:
+  * The following new API routines for LP/MIP preprocessing were added:
+    + glp_npp_alloc_wksp    allocate the preprocessor workspace
+    + glp_npp_load_prob     load original problem instance
+    + glp_npp_preprocess1   perform basic LP/MIP preprocessing
+    + glp_npp_build_prob    build resultant problem instance
+    + glp_npp_postprocess   postprocess solution to resultant problem
+    + glp_npp_obtain_sol    obtain solution to original problem
+    + glp_npp_free_wksp     free the preprocessor workspace
+  * A new, more robust implementation of locally valid simple cover
+    cuts was included in the MIP solver.
+  * The API routine glp_init_iocp was changed to enable long-step
+    option of the dual simplex by default.
+- Add glpk-no_random_return.patch
+
 -------------------------------------------------------------------
 Mon Dec 11 20:52:49 UTC 2017 - astieger@suse.com
 
diff --git a/glpk.spec b/glpk.spec
index c39e7c2..cba5d96 100644
--- a/glpk.spec
+++ b/glpk.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package glpk
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,15 +18,16 @@
 
 %define lname   libglpk40
 Name:           glpk
-Version:        4.64
+Version:        4.65
 Release:        0
 Summary:        GNU Linear Programming Kit
-License:        GPL-3.0
+License:        GPL-3.0-only
 Group:          Productivity/Scientific/Math
-Url:            https://www.gnu.org/software/glpk/glpk.html
+URL:            https://www.gnu.org/software/glpk/glpk.html
 Source0:        https://ftp.gnu.org/gnu/glpk/%{name}-%{version}.tar.gz
 Source1:        https://ftp.gnu.org/gnu/glpk/%{name}-%{version}.tar.gz.sig
 Source2:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=%{name}&download=1#/%{name}.keyring
+Patch0:         glpk-no_random_return.patch
 BuildRequires:  ghostscript
 BuildRequires:  gmp-devel
 BuildRequires:  texlive
@@ -73,6 +74,7 @@ callable library.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"