From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 30 Jan 2017 18:20:06 +0000 (+0100)
Subject: - updated to 4.61
X-Git-Tag: auto/th/glpk-4.61-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=fe5adb2af872eb1508aea98e118c41b63ad6e428;p=packages%2Fglpk.git

- updated to 4.61
---

diff --git a/glpk-sonames.patch b/glpk-sonames.patch
index b923756..630f948 100644
--- a/glpk-sonames.patch
+++ b/glpk-sonames.patch
@@ -8,8 +8,8 @@
 -      LIBODBC="libodbc.so"
 -      LIBMYSQL="libmysqlclient.so"
 +      LIBIODBC="libiodbc.so.2"
-+      LIBODBC="libodbc.so.2"
-+      LIBMYSQL="libmysqlclient.so.18"
++      LIBODBC="@libodbc_soname@"
++      LIBMYSQL="@libmysqlclient_soname@"
        ;;
  esac
  
diff --git a/glpk.spec b/glpk.spec
index 91d291f..289d07a 100644
--- a/glpk.spec
+++ b/glpk.spec
@@ -1,12 +1,12 @@
 Summary:	Solver LP and MIP problems
 Summary(pl.UTF-8):	Narzędzie do rozwiązywania problemów LP i MIP
 Name:		glpk
-Version:	4.60
+Version:	4.61
 Release:	1
 License:	GPL v3+
 Group:		Applications/Math
 Source0:	http://ftp.gnu.org/gnu/glpk/%{name}-%{version}.tar.gz
-# Source0-md5:	eda7965907f6919ffc69801646f13c3e
+# Source0-md5:	3ce3e224a8b6e75a1a0b378445830f21
 Patch0:		%{name}-dl.patch
 Patch1:		%{name}-sonames.patch
 URL:		http://www.gnu.org/software/glpk/glpk.html
@@ -15,13 +15,17 @@ BuildRequires:	automake
 BuildRequires:	gmp-devel
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	mysql-devel >= 5.5.10
+BuildRequires:	rpmbuild(macros) >= 1.721
+BuildRequires:	sed >= 4.0
 BuildRequires:	unixODBC-devel >= 2.3.1
-%ifarch %{x8664} ppc64 sparc64 s390x
-Suggests:	libodbc.so.2()(64bit)
-Suggests:	libmysqlclient.so.18()(64bit)
-%else
-Suggests:	libodbc.so.2
-Suggests:	libmysqlclient.so.18
+%if 0%{?_soname_prov:1}
+%define	libodbc_soname	libodbc.so.2
+%define	libmysqlclient_soname	libmysqlclient.so.18
+# BRs to verify current sonames (bump the above if not satisfied)
+BuildRequires:	%{_soname_prov %{libodbc_soname}}
+BuildRequires:	%{_soname_prov %{libmysqlclient_soname}}
+Suggests:	%{_soname_prov %{libodbc_soname}}
+Suggests:	%{_soname_prov %{libmysqlclient_soname}}
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,6 +71,9 @@ Narzędzie do rozwiązywania problemów LP i MIP - biblioteka statyczna.
 %patch0 -p1
 %patch1 -p1
 
+%{__sed} -i -e 's,@libodbc_soname@,%{libodbc_soname},' \
+            -e 's,@libmysqlclient_soname@,%{libmysqlclient_soname},' configure.ac
+
 %build
 %{__libtoolize}
 %{__aclocal}