From 2d90a855b900ec9c7b65f27110b8a1d070e08a33 Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cse.cem@gmail.com>
Date: Feb 14 2014 14:18:36 +0000
Subject: Bump to latest upstream 4.53


- Drop glp_get_it_cnt() patch; now present in glpk.h, glpapi06.c

---

diff --git a/.gitignore b/.gitignore
index 08ecd13..2e00ec8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ glpk-4.43.tar.gz
 /glpk-4.47.tar.gz
 /glpk-4.48.tar.gz
 /glpk-4.52.1.tar.gz
+/glpk-4.53.tar.gz
diff --git a/glpk-4.52.1-add-glp_get_it_cnt.diff b/glpk-4.52.1-add-glp_get_it_cnt.diff
deleted file mode 100644
index 5820c33..0000000
--- a/glpk-4.52.1-add-glp_get_it_cnt.diff
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/glpk.h.orig	2013-07-28 04:00:00.000000000 -0400
-+++ src/glpk.h	2013-10-22 11:43:42.645774808 -0400
-@@ -400,20 +400,32 @@
- 
- int glp_get_num_nz(glp_prob *P);
- /* retrieve number of constraint coefficients */
- 
- int glp_get_mat_row(glp_prob *P, int i, int ind[], double val[]);
- /* retrieve row of the constraint matrix */
- 
- int glp_get_mat_col(glp_prob *P, int j, int ind[], double val[]);
- /* retrieve column of the constraint matrix */
- 
-+#ifdef FEDORA_GLPK_ITCNT
-+/*
-+ * A similar function is defined in GLPK 4.48, shipped in F-19 and older.
-+ * However, 4.52.1, shipped in F-20+, does not include a replacement. For now,
-+ * Fedora packages can define FEDORA_GLPK_ITCNT before including glpk.h to work
-+ * around the problem. In the future, GLPK intends to add the below function to
-+ * a release, at which point this patch can be dropped.
-+ */
-+int glp_get_it_cnt(glp_prob *P);
-+/* retrieve iteration count */
-+#endif
-+
- void glp_create_index(glp_prob *P);
- /* create the name index */
- 
- int glp_find_row(glp_prob *P, const char *name);
- /* find row by its name */
- 
- int glp_find_col(glp_prob *P, const char *name);
- /* find column by its name */
- 
- void glp_delete_index(glp_prob *P);
---- src/glpapi02.c.orig	2013-07-28 04:00:00.000000000 -0400
-+++ src/glpapi02.c	2013-10-22 11:41:48.092715966 -0400
-@@ -481,11 +481,32 @@
-       len = 0;
-       for (aij = lp->col[j]->ptr; aij != NULL; aij = aij->c_next)
-       {  len++;
-          if (ind != NULL) ind[len] = aij->row->i;
-          if (val != NULL) val[len] = aij->val;
-       }
-       xassert(len <= lp->m);
-       return len;
- }
- 
-+/***********************************************************************
-+*  NAME
-+*
-+*  glp_get_it_cnt - retrieve iteration count
-+*
-+*  SYNOPSIS
-+*
-+*  int glp_get_it_cnt(glp_prob *lp);
-+*
-+*  DESCRIPTION
-+*
-+*  The routine glp_get_it_count retrieves the iteration count set by a
-+*  solving routine.
-+*
-+*  RETURNS
-+*
-+*  The routine glp_get_it_count returns the iteration count. */
-+
-+int glp_get_it_cnt(glp_prob *lp)
-+{     return lp->it_cnt;
-+}
- /* eof */
diff --git a/glpk.spec b/glpk.spec
index 9adadb3..18718e8 100644
--- a/glpk.spec
+++ b/glpk.spec
@@ -1,15 +1,12 @@
 Name:           glpk
-Version:        4.52.1
-Release:        2%{?dist}
+Version:        4.53
+Release:        1%{?dist}
 Summary:        GNU Linear Programming Kit
 
 Group:          System Environment/Libraries
 License:        GPLv3
 URL:            http://www.gnu.org/software/glpk/glpk.html
 Source0:        ftp://ftp.gnu.org/gnu/glpk/glpk-%{version}.tar.gz
-# Oct 22, 2013: A temporary workaround until upstream ships a release with the
-# glp_get_it_cnt() function.
-Patch0:         glpk-4.52.1-add-glp_get_it_cnt.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -70,7 +67,6 @@ the GLPK (GNU Linear Programming Kit) libraries.
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 export LIBS=-ldl
@@ -120,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb 14 2014 Conrad Meyer <cemeyer@uw.edu> - 4.53
+- Bump to latest upstream 4.53
+- Drop glp_get_it_cnt() patch; now present in glpk.h, glpapi06.c
+
 * Tue Oct 22 2013 Conrad Meyer <cemeyer@uw.edu> - 4.52.1-2
 - Add patch to backport glp_get_it_cnt() to 4.52.1 per bug #999609
 
diff --git a/sources b/sources
index 23d15ca..aa579dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a61813b1bf737a829a933968b83e5a73  glpk-4.52.1.tar.gz
+dbec25d85b30e16928304b7d6bf8be22  glpk-4.53.tar.gz