From 3e2e5a48df2428c31b7143f92e00d133a20a59b3 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Fri, 27 May 2016 08:30:46 +0000 Subject: [PATCH] upgrading package: cntk 20160526 -> 20160527 --- cntk/cntk.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cntk/cntk.spec b/cntk/cntk.spec index b4c79e7621..6a31a93775 100644 --- a/cntk/cntk.spec +++ b/cntk/cntk.spec @@ -31,8 +31,11 @@ Distribution: OpenPKG Community Class: EVAL Group: Algorithm License: BSD-style -Version: 20160526 -Release: 20160526 +Version: 20160527 +Release: 20160527 + +# package options +%option with_opencv no # list of sources Source0: http://download.openpkg.org/components/versioned/cntk/CNTK-%{version}.tar.xz @@ -42,8 +45,12 @@ Patch0: cntk.patch # build information BuildPreReq: OpenPKG, openpkg >= 20160101, gcc, gcc::with_cxx = yes PreReq: OpenPKG, openpkg >= 20160101 -BuildPreReq: opencv, openmpi, openmpi::with_cxx = yes, openblas, libzip -PreReq: opencv, openmpi, openmpi::with_cxx = yes, openblas, libzip +BuildPreReq: openmpi, openmpi::with_cxx = yes, openblas, libzip +PreReq: openmpi, openmpi::with_cxx = yes, openblas, libzip +%if "%{with_opencv}" == "yes" +BuildPreReq: opencv +PreReq: opencv +%endif %description CNTK, the Computational Network Toolkit by Microsoft Research, is a @@ -86,7 +93,9 @@ PreReq: opencv, openmpi, openmpi::with_cxx = yes, openblas, libzip %{l_bash} ./configure \ --with-buildtype=release \ --with-openblas=%{l_prefix} \ +%if "%{with_opencv}" == "yes" --with-opencv=%{l_prefix} \ +%endif --with-libzip \ --with-code-coverage=no