[coin-or-lemon/f19] (F19 only) don't use Cbc or Clp

amluto amluto at fedoraproject.org
Mon Jun 9 21:35:04 UTC 2014


commit ed1bd5cb2031e34e832fcc4010736b83ea6274bd
Author: Andy Lutomirski <luto at amacapital.net>
Date:   Mon Jun 9 14:34:42 2014 -0700

    (F19 only) don't use Cbc or Clp

 coin-or-lemon.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/coin-or-lemon.spec b/coin-or-lemon.spec
index 8c8dab3..382cab2 100644
--- a/coin-or-lemon.spec
+++ b/coin-or-lemon.spec
@@ -13,7 +13,7 @@ Patch0:         lemon-1.3-tsp_test-1ba759c76810.patch
 # Fix for upstream bug #481, needed to link LP solvers
 Patch1:         lemon-1.3-lp-linkage.patch
 
-BuildRequires:  cmake coin-or-Clp-devel coin-or-Cbc-devel glpk-devel bzip2-devel zlib-devel
+BuildRequires:  cmake 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
@@ -67,10 +67,12 @@ sed -i -e "s/${sover_prefix})/${sover_prefix} VERSION %{libemon_soversion} SOVER
 
 # CPLEX (aka ILOG) and SOPLEX are non-free, so don't try to detect them.
 #
+# Fedora 19 doesn't have Cbc or Clp.
+#
 # We suppress detection of ghostscript, doxygen, and python to make
 # the build behave the same way with and without them installed -- we
 # don't actually need them, since we don't need to rebuild the docs.
-%cmake -DLEMON_ENABLE_GLPK=YES -DLEMON_ENABLE_ILOG=NO -DLEMON_ENABLE_COIN=YES \
+%cmake -DLEMON_ENABLE_GLPK=YES -DLEMON_ENABLE_ILOG=NO -DLEMON_ENABLE_COIN=NO \
     -DLEMON_ENABLE_SOPLEX=no \
     -DGHOSTSCRIPT_EXECUTABLE= -DDOXYGEN_EXECUTABLE= -DPYTHON_EXECUTABLE=
 
@@ -131,6 +133,7 @@ mv %{buildroot}/%{_datadir}/lemon %{buildroot}/%{_datadir}/%{name}
 %changelog
 * Mon Jun 09 2014 Andy Lutomirski <luto at mit.edu> - 1.3-6
 - Fix BR.
+- (F19 only) disable Clp and Cbc.
 
 * Mon Jun 09 2014 Andy Lutomirski <luto at mit.edu> - 1.3-5
 - Enable GLPK, Clp, and Cbc.


More information about the scm-commits mailing list