[coin-or-lemon] Bump to 1.3.1

[amluto]

commit 7cf3d57048186cdee8fad0e00063d324a1247789
Author: Andy Lutomirski <luto at amacapital.net>
Date:   Tue Jul 8 14:46:31 2014 -0700

    Bump to 1.3.1

 coin-or-lemon.spec                    |   25 ++++++++++---------------
 lemon-1.3-lp-linkage.patch            |   21 ---------------------
 lemon-1.3-tsp_test-1ba759c76810.patch |   21 ---------------------
 lemon-1.3.1-buildfix.patch            |   27 +++++++++++++++++++++++++++
 lemon-1.3.1-cmake-policy.patch        |   12 ++++++++++++
 5 files changed, 49 insertions(+), 57 deletions(-)
---
diff --git a/coin-or-lemon.spec b/coin-or-lemon.spec
index 8c8dab3..4904b08 100644
--- a/coin-or-lemon.spec
+++ b/coin-or-lemon.spec
@@ -1,24 +1,20 @@
 Name:           coin-or-lemon
-Version:        1.3
-Release:        6%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        A C++ template library providing many common graph algorithms
 
 License:        Boost and BSD
 URL:            http://lemon.cs.elte.hu/trac/lemon
 Source0:        http://lemon.cs.elte.hu/pub/sources/lemon-%{version}.tar.gz
 
-# Fix for upstream bug #476, needed for tests to pass.
-Patch0:         lemon-1.3-tsp_test-1ba759c76810.patch
+# https://lemon.cs.elte.hu/trac/lemon/ticket/502
+Patch0:         lemon-1.3.1-cmake-policy.patch
 
-# Fix for upstream bug #481, needed to link LP solvers
-Patch1:         lemon-1.3-lp-linkage.patch
+# https://lemon.cs.elte.hu/trac/lemon/ticket/503
+Patch1:         lemon-1.3.1-buildfix.patch
 
 BuildRequires:  cmake coin-or-Clp-devel coin-or-Cbc-devel glpk-devel bzip2-devel zlib-devel
 
-# We need to force a soname, because upstream doesn't provide one.  See:
-# http://lemon.cs.elte.hu/trac/lemon/ticket/482
-%global libemon_soversion 0.1
-
 %description
 LEMON stands for Library for Efficient Modeling and Optimization in
 Networks. It is a C++ template library providing efficient
@@ -57,11 +53,6 @@ The %{name}-doc package contains a %{name}'s API documentation.
 %patch0 -p1
 %patch1 -p1
 
-# Force a soname
-sover_prefix="SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon"
-grep -q "${sover_prefix})" lemon/CMakeLists.txt
-sed -i -e "s/${sover_prefix})/${sover_prefix} VERSION %{libemon_soversion} SOVERSION %{libemon_soversion})/" lemon/CMakeLists.txt
-
 
 %build
 
@@ -129,6 +120,10 @@ mv %{buildroot}/%{_datadir}/lemon %{buildroot}/%{_datadir}/%{name}
 
 
 %changelog
+* Tue Jul 08 2014 Andy Lutomirski <luto at mit.edu> - 1.3.1-1
+- New minor release.
+- Drop now-unnecessary patches (thanks, LEMON upstream!).
+
 * Mon Jun 09 2014 Andy Lutomirski <luto at mit.edu> - 1.3-6
 - Fix BR.
 
diff --git a/lemon-1.3.1-buildfix.patch b/lemon-1.3.1-buildfix.patch
new file mode 100644
index 0000000..ecc4a81
--- /dev/null
+++ b/lemon-1.3.1-buildfix.patch
@@ -0,0 +1,27 @@
+--- 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
+@@ -22,15 +22,19 @@
+ #include<lemon/config.h>
+ 
+ 
+-#ifdef LEMON_HAVE_GLPK
++#if LEMON_HAVE_GLPK
+ #include <lemon/glpk.h>
+-#elif LEMON_HAVE_CPLEX
++#endif
++#if LEMON_HAVE_CPLEX
+ #include <lemon/cplex.h>
+-#elif LEMON_HAVE_SOPLEX
++#endif
++#if LEMON_HAVE_SOPLEX
+ #include <lemon/soplex.h>
+-#elif LEMON_HAVE_CLP
++#endif
++#if LEMON_HAVE_CLP
+ #include <lemon/clp.h>
+-#elif LEMON_HAVE_CBC
++#endif
++#if LEMON_HAVE_CBC
+ #include <lemon/cbc.h>
+ #endif
+ 
diff --git a/lemon-1.3.1-cmake-policy.patch b/lemon-1.3.1-cmake-policy.patch
new file mode 100644
index 0000000..6463c56
--- /dev/null
+++ b/lemon-1.3.1-cmake-policy.patch
@@ -0,0 +1,12 @@
+--- lemon-1.3.1/CMakeLists.txt.orig	2014-07-08 14:22:38.225366435 -0700
++++ lemon-1.3.1/CMakeLists.txt	2014-07-08 14:22:56.331478072 -0700
+@@ -1,6 +1,8 @@
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+ 
+-CMAKE_POLICY(SET CMP0048 OLD)
++IF(POLICY CMP0048)
++  CMAKE_POLICY(SET CMP0048 OLD)
++ENDIF(POLICY CMP0048)
+ 
+ SET(PROJECT_NAME "LEMON")
+ PROJECT(${PROJECT_NAME})