[coin-or-lemon] Use upstream fix for #503

[amluto]

commit 1904793e281839370c953fff4e05927db6319483
Author: Andy Lutomirski <luto at amacapital.net>
Date:   Wed Jul 9 08:43:00 2014 -0700

    Use upstream fix for #503

 coin-or-lemon.spec         |    5 ++++-
 lemon-1.3.1-buildfix.patch |   23 ++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/coin-or-lemon.spec b/coin-or-lemon.spec
index 4904b08..2329fe0 100644
--- a/coin-or-lemon.spec
+++ b/coin-or-lemon.spec
@@ -1,6 +1,6 @@
 Name:           coin-or-lemon
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A C++ template library providing many common graph algorithms
 
 License:        Boost and BSD
@@ -120,6 +120,9 @@ mv %{buildroot}/%{_datadir}/lemon %{buildroot}/%{_datadir}/%{name}
 
 
 %changelog
+* Wed Jul 09 2014 Andy Lutomirski <luto at mit.edu> - 1.3.1-2
+- Switch to the upstream fix for bug 503.
+
 * Tue Jul 08 2014 Andy Lutomirski <luto at mit.edu> - 1.3.1-1
 - New minor release.
 - Drop now-unnecessary patches (thanks, LEMON upstream!).
diff --git a/lemon-1.3.1-buildfix.patch b/lemon-1.3.1-buildfix.patch
index ecc4a81..a8b8267 100644
--- a/lemon-1.3.1-buildfix.patch
+++ b/lemon-1.3.1-buildfix.patch
@@ -1,27 +1,36 @@
---- lemon-1.3.1/lemon/lp.h.orig	2014-07-08 14:38:52.697404303 -0700
-+++ lemon-1.3.1/lemon/lp.h	2014-07-08 14:39:44.029726793 -0700
+# HG changeset patch
+# User Alpar Juttner <alpar at cs.elte.hu>
+# Date 1404909696 -7200
+#      Wed Jul 09 14:41:36 2014 +0200
+# Node ID 5de6a70446f6ed13d456d1df8d0bfd4085bcf2af
+# Parent  1552352f97987f8fea7482cb144ba23cd5466484
+Fix buggy include logic in lemon/lp.h (#503)
+
+diff --git a/lemon/lp.h b/lemon/lp.h
+--- a/lemon/lp.h
++++ b/lemon/lp.h
 @@ -22,15 +22,19 @@
  #include<lemon/config.h>
  
  
 -#ifdef LEMON_HAVE_GLPK
-+#if LEMON_HAVE_GLPK
++#if LEMON_DEFAULT_LP == _LEMON_GLPK || LEMON_DEFAULT_MIP == _LEMON_GLPK
  #include <lemon/glpk.h>
 -#elif LEMON_HAVE_CPLEX
 +#endif
-+#if LEMON_HAVE_CPLEX
++#if LEMON_DEFAULT_LP == _LEMON_CPLEX || LEMON_DEFAULT_MIP == _LEMON_CPLEX 
  #include <lemon/cplex.h>
 -#elif LEMON_HAVE_SOPLEX
 +#endif
-+#if LEMON_HAVE_SOPLEX
++#if LEMON_DEFAULT_LP == _LEMON_SOPLEX
  #include <lemon/soplex.h>
 -#elif LEMON_HAVE_CLP
 +#endif
-+#if LEMON_HAVE_CLP
++#if LEMON_DEFAULT_LP == _LEMON_CLP
  #include <lemon/clp.h>
 -#elif LEMON_HAVE_CBC
 +#endif
-+#if LEMON_HAVE_CBC
++#if LEMON_DEFAULT_MIP == _LEMON_CBC
  #include <lemon/cbc.h>
  #endif