From 4632dcc296bce3f1d28b1729aac494c0dd207de8565568c4a9597c152e809871 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 23 Jan 2017 16:02:52 +0000
Subject: [PATCH] Accepting request 451981 from home:pluskalm:branches:science

- Update to version 4.61:

OBS-URL: https://build.opensuse.org/request/show/451981
OBS-URL: https://build.opensuse.org/package/show/science/glpk?expand=0&rev=36
---
 glpk-4.60.tar.gz     |   3 ---
 glpk-4.60.tar.gz.sig | Bin 65 -> 0 bytes
 glpk-4.61.tar.gz     |   3 +++
 glpk-4.61.tar.gz.sig | Bin 0 -> 65 bytes
 glpk.changes         |  11 +++++++++++
 glpk.keyring         | Bin 1458 -> 895 bytes
 glpk.spec            |   7 +++----
 7 files changed, 17 insertions(+), 7 deletions(-)
 delete mode 100644 glpk-4.60.tar.gz
 delete mode 100644 glpk-4.60.tar.gz.sig
 create mode 100644 glpk-4.61.tar.gz
 create mode 100644 glpk-4.61.tar.gz.sig

diff --git a/glpk-4.60.tar.gz b/glpk-4.60.tar.gz
deleted file mode 100644
index 26ddbc3..0000000
--- a/glpk-4.60.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1356620cb0a0d33ac3411dd49d9fd40d53ece73eaec8f6b8d19a77887ff5e297
-size 4160915
diff --git a/glpk-4.60.tar.gz.sig b/glpk-4.60.tar.gz.sig
deleted file mode 100644
index 8401fffaa17c43a9857e63b1c3122f428af15d696cf4a5ea3650cc2f347de019..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65
zcmV-H0KWf-KLZ5-R{l~v(R=bRS%K&n5dt$o0GtaNHrVbO)3966_-9ml5MGYGpi}^z
X7;k*_p|pZrCu5MBbZdzk@IOv{V-FkH

diff --git a/glpk-4.61.tar.gz b/glpk-4.61.tar.gz
new file mode 100644
index 0000000..0cdda3f
--- /dev/null
+++ b/glpk-4.61.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9866de41777782d4ce21da11b88573b66bb7858574f89c28be6967ac22dfaba9
+size 4116291
diff --git a/glpk-4.61.tar.gz.sig b/glpk-4.61.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..f7c5ecf48bfbba90d0e0bf90b617b5e49df4832d069bfa25088a7a5af4a34256
GIT binary patch
literal 65
zcmV-H0KWf-KLZ5-ScIx!(R=bRS%K&n5dvzs0HBccR<Kva+WxGdT{1xD3iB>+P(1*j
XR6$I@`l2kR>7IV^_AlVp;S<JM#nd1U

literal 0
HcmV?d00001

diff --git a/glpk.changes b/glpk.changes
index f37c3dd..7a8d919 100644
--- a/glpk.changes
+++ b/glpk.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jan 23 16:00:00 UTC 2017 - mpluskal@suse.com
+
+- Update to version 4.61:
+  * An option was added to build a re-entrant version of the
+    package suitable for running in a multi-threaded environment.
+  * A re-entrant version of the package allows running multiple
+    independent instances of glpk in different threads of a
+    multi-threaded application.
+- Use savannah as source for gpg keyring
+
 -------------------------------------------------------------------
 Fri Apr  1 11:44:47 UTC 2016 - mpluskal@suse.com
 
diff --git a/glpk.keyring b/glpk.keyring
index 46f2f4e9bc087275bbb3865247aae26b017364347c37b8e16b1e40d438bc6156..f5a8bc31e11b38322ccd0cb7949400cbaaf7ec50f96f6fc98bda2449c8775da8 100644
GIT binary patch
literal 895
zcmV-_1AzRQ0ipyy6m>rl1OU3pW-+0yTkTJK+?^u^<SBuf;a*XRCX*R}1-*Ij!4F>V
zhC*h9^-e$%kx}E0EycI}uFW!oOEKAn)fh9>Q`O6KU<5lDkA$h=5JItk=+hP9`aE8O
zcPrtyP0<^q(|TUbTT6@D7|I86e2#TW$l2Qb7(bw4GYkI4vLJGIII94lpeU`|sgrj>
zXc+0NLg=ZZrTHzT1OHijHlaw4A)Q*-avOB&vLd+?4)GUv%MbupDEQkv#8Wco7x8t+
znQswLJ#Rl-h7NHj>d&8z&HqN$swz5$G1Befcn3m4CTUnMHk6Vh6L&45y3;^l0lX4-
zR_K`;mNr*20M7X9)o&PYKuVB-z2y|HtRAd(Tv5B{fWEe*hbja9HFWJUVzZN|#9_J%
zm@)y&+ZON#U?bT&k-!<c_pr!IZb9~OKJiN%jAU`EaVC1<-e;K&<rc(Ac?M7)FocH~
z#_{#&bWNDeS&m_71yc5Bq_%>Vwq;7JtFT$K=xc~cX5H7$Kr4Iq`aI`ridyblN<22o
zC#F;llk(BHI)i!+v?D=oWO8M9AWdOwXm4_9ZXi5uVQ)ZfVQDfha${~~bS`prK8RZc
z6A=Oc8wCPC6m>ra3ke7Z0|EmT0s{jU0s#UZ0Rk6*0162Z(R=bRS%K&nsz(5xI5KS3
zD!&eiH#7ylzeGNIY3V870G%5-&@d;~7Du5#_TDw1dB{>M`^LEe4Fo?Fbx;rl0PWP=
zeoWFPFVmp7kgIa(7naF^_zN=tex0Q~RSL}%qdwXIC#0mT6pArFl=wEG#hwb_cH*A#
z>fY<+!Dg|?4KOPbW#Wc95MebYsrLu}z>|*AXwxUI&sFb#R!>$9MwBmyj1CFo9*`X5
zvHmxPZXHQp4>1V~nz0@mZ-HT^X8;2Q1O6>kcw-qEG0nu>d~kvJiZ?xXh(ODTvrQaS
zpsO_(i=Hp{1!h9i4{aAVQg=U;MR%V)V8*xrwd(T1RN(aJ*9bsstv&60_0=aS|3R0k
zob)`FvlNqbU(am1oGtMl_72}35-@d-u>KUP+I`ItL`=+hj89cJ3h~_n&PdH)@(+kc
z1Q-zl00spDKNNLP0162Z(R=bRS%K&nMUeoT1YRaX60N&55eqiLJd+5=c_=t{0HBfE
V^lw$CeMLReg^ARN^Vm$izc&X2k5vEw

literal 1458
zcmaKsx32407DRJ?#m$8W8qqe;!8!C+w4%xAL??RDh+jXqCz}a+0~PIH1%+CF{`?*k
zW!3tzW&6htprP_Vx)}dJ<H76yeE%TNa#@>k`0Ga=He3GL2?XgKxq$*36h7-hz|-F_
zKF1W#n1EyM8rH(inW|){qqnSSlbKW?<jR)-1)SOIPV14{em)$iyFvMQ7<qU{Q^qn!
z%P@;x!rkh^CHwikyA>4HxFx-bbRoY+=!l(BeQVDWsfK(Zv%<pMt;6n9c|AWy!;SH`
zD$bWm;ojON#D2s!4Qun*Z|9;``H++I!B->Sd=P@}{Q{Fl`O&Y=)=VQEQAQdFDE?-w
zSyJ0ZF2Ya!mGAz%HaaC9%qiVph6rG!+iix}rt6zq9<foR^daj80>0b$CJTc&(Ch8h
z=6BTnq_f`6vRN1(GO84(Q~UH;ZPw&@h<aLgBh_gPgB8dQufVghcjwT0=NB*;lIEVf
zEOWq{c(|8Au*^rfC`le<`%oD)flO*X1C+#z2X@BG!=FvJ-l{D&E5#tr?0^Jl34eAE
z*wY*%s2)K<ZV+#5ux737p2&O``*Kstgz7BH%|tKi<N&fqt>*E$D>$vVR&U}-+e;&S
z8bm^SL^Y*E63pw&zyw)u_0ov%{$9Ku4*y{|bYv-F)5DF*y!IfzP1!#I;j<r^e2f+?
zEKci$RG0V9yDH)}k`ncv_wP*=&QBb2APc3*Y^ZNcQ161LzJ*V#;o<nAqXPK|c>8p5
z`-lzRsT6Ri0wOu80M3{Pj#~aEssPY=S8z*IJ;GQSWqneBMv`WKh5Eui8b8NiMx(Ak
z(P`OD$o=38`5GLPe}z(4){dQ(Rtl-Fq^>tMRpWo5{{u(<kM8{s9TaaDhYA29oVy$h
zZS~Epc-{|Mvo1&47fwX%VVY=fcmWN|9tAiwE)HE<0^EnhM`cih=3>sJgM#CrlJay!
z-~guZ^H+CyT7&w?Xf)1zHztY7wCYtE<^gX*8gNf%u_WER5fvCF-CHGfJZ;J+tyz(V
zYN?7%FWGV_5&9OvWKk5s2aDK8P2G-8><9h)$`zF5{q`e`*tgs+JlbD)Vm~Wfe)Bh_
z1*Arvw1X%Q??l^D&T3qXD)!`^EnQtQ%Sfr7`W%4ccUTP`l(Lz~zG9u$$>yp;HEqrn
zWDSrn*<8MR2BW^>61kNInoCJ%_yU1N)?2&Vlq(e!%f)6&0wbE)RSQVlAMv9GDUERm
z6J0p&<r9j@(L7z4t)-WwSy;q!>oy%9)@2Cc!<J$T@s<&8lD?#`9CKaqGE4Qek*A;Q
zY=QAt*IE&(+KotxG8B0LVhOars(b#HSal8-?O#*sAq^`f2@1zO00cqkB0yWks7VBI
zCKwBfhPA3}ceG0BRb=sNovzri3=fA_5OCNSYPi~7g!tw5EB_n$I~z9^`LAz9OZXQV
F{|8$@(un{7

diff --git a/glpk.spec b/glpk.spec
index 37bd608..af9ed2f 100644
--- a/glpk.spec
+++ b/glpk.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package glpk
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,7 +18,7 @@
 
 %define lname   libglpk40
 Name:           glpk
-Version:        4.60
+Version:        4.61
 Release:        0
 Summary:        GNU Linear Programming Kit
 License:        GPL-3.0
@@ -26,11 +26,10 @@ Group:          Productivity/Scientific/Math
 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:        %{name}.keyring
+Source2:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=%{name}&download=1#/%{name}.keyring
 BuildRequires:  ghostscript
 BuildRequires:  gmp-devel
 BuildRequires:  texlive
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The GLPK package is intended for solving large-scale linear