[glpk] - fix the zlib unbundling

[Dan Horák]

commit b8e012aae497bf01b49f6c1f0b21e3379339f4a6
Author: Dan Horák <dan at danny.cz>
Date:   Wed Jun 4 21:58:12 2014 +0200

    - fix the zlib unbundling

 glpk-4.53-unbundle-zlib.diff |   37 ++++++++++++++++---------------------
 glpk.spec                    |    7 +++++--
 2 files changed, 21 insertions(+), 23 deletions(-)
---
diff --git a/glpk-4.53-unbundle-zlib.diff b/glpk-4.53-unbundle-zlib.diff
index f4684de..38df8b4 100644
--- a/glpk-4.53-unbundle-zlib.diff
+++ b/glpk-4.53-unbundle-zlib.diff
@@ -1,7 +1,7 @@
-diff -urN glpk-4.53.orig/doc/glpk11.tex glpk-4.53/doc/glpk11.tex
---- glpk-4.53.orig/doc/glpk11.tex	2014-02-13 04:00:00.000000000 -0500
-+++ glpk-4.53/doc/glpk11.tex	2014-05-29 14:11:17.267644446 -0400
-@@ -154,50 +154,4 @@
+diff -up glpk-4.53/doc/glpk11.tex.system-zlib glpk-4.53/doc/glpk11.tex
+--- glpk-4.53/doc/glpk11.tex.system-zlib	2014-02-13 10:00:00.000000000 +0100
++++ glpk-4.53/doc/glpk11.tex	2014-06-04 21:46:24.000000000 +0200
+@@ -154,50 +154,4 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
  \noindent
  \url{http://www.cs.chalmers.se/Cs/Research/FormalMethods/MiniSat}
  
@@ -52,10 +52,10 @@ diff -urN glpk-4.53.orig/doc/glpk11.tex glpk-4.53/doc/glpk11.tex
 -\url{http://www.zlib.net/}
 -
  %* eof *%
-diff -urN glpk-4.53.orig/src/Makefile.am glpk-4.53/src/Makefile.am
---- glpk-4.53.orig/src/Makefile.am	2014-02-13 04:00:00.000000000 -0500
-+++ glpk-4.53/src/Makefile.am	2014-05-29 14:10:00.882564303 -0400
-@@ -13,8 +13,7 @@
+diff -up glpk-4.53/src/Makefile.am.system-zlib glpk-4.53/src/Makefile.am
+--- glpk-4.53/src/Makefile.am.system-zlib	2014-02-13 10:00:00.000000000 +0100
++++ glpk-4.53/src/Makefile.am	2014-06-04 21:46:49.000000000 +0200
+@@ -13,13 +13,14 @@ libglpk_la_CPPFLAGS = \
  -I$(srcdir)/env \
  -I$(srcdir)/minisat \
  -I$(srcdir)/misc \
@@ -65,7 +65,14 @@ diff -urN glpk-4.53.orig/src/Makefile.am glpk-4.53/src/Makefile.am
  
  libglpk_la_LDFLAGS = \
  -version-info 37:0:1 \
-@@ -147,21 +146,6 @@
+ -export-symbols-regex '^glp_*'
+ 
++libglpk_la_LIBADD = -lz
++
+ libglpk_la_SOURCES = \
+ avl.c \
+ bfd.c \
+@@ -147,21 +148,6 @@ misc/triang.c \
  misc/wclique.c \
  misc/wclique1.c \
  proxy/proxy.c \
@@ -88,15 +95,3 @@ diff -urN glpk-4.53.orig/src/Makefile.am glpk-4.53/src/Makefile.am
 +proxy/proxy1.c
  
  ## eof ##
-diff -urN glpk-4.53.orig/examples/Makefile.am glpk-4.53/examples/Makefile.am
---- glpk-4.53.orig/examples/Makefile.am	2014-02-13 04:00:00.000000000 -0500
-+++ glpk-4.53/examples/Makefile.am	2014-05-29 14:29:09.113874836 -0400
-@@ -2,7 +2,7 @@
- 
- AM_CPPFLAGS = -I$(srcdir)/../src
- 
--LDADD = ../src/libglpk.la
-+LDADD = ../src/libglpk.la -lz
- 
- bin_PROGRAMS = glpsol
- 
diff --git a/glpk.spec b/glpk.spec
index 25e6906..80d7951 100644
--- a/glpk.spec
+++ b/glpk.spec
@@ -1,6 +1,6 @@
 Name:           glpk
 Version:        4.53
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNU Linear Programming Kit
 
 Group:          System Environment/Libraries
@@ -75,7 +75,7 @@ the GLPK (GNU Linear Programming Kit) libraries.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .system-zlib
 rm -rf src/zlib
 
 %build
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 04 2014 Dan Horák <dan[at]danny.cz> - 4.53-3
+- fix the zlib unbundling
+
 * Thu May 29 2014 Cornad Meyer <cemeyer at uw.edu> - 4.53-2
 - Un-bundle zlib (rh #1102855)