[mlpack/el6] Use cmake28 on RHEL systems, not cmake.

rcurtin rcurtin at fedoraproject.org
Wed Jan 2 19:00:56 UTC 2013


commit 9da317a98d3cd787d9b463b5815f3611150fdb2b
Author: Ryan Curtin <gth671b at mail.gatech.edu>
Date:   Wed Jan 2 14:00:40 2013 -0500

    Use cmake28 on RHEL systems, not cmake.

 mlpack.spec |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/mlpack.spec b/mlpack.spec
index 8c67beb..88a79f9 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
 Name:           mlpack
 Version:        1.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Scalable, fast C++ machine learning library
 
 Group:          System Environment/Libraries
@@ -21,7 +21,13 @@ Patch1:         u64_s64.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Use cmake28 package on RHEL.
+%if 0%{?rhel}
+BuildRequires:  cmake28 >= 2.8.0
+%else
 BuildRequires:  cmake >= 2.8.0
+%endif
+
 # 2.4.0 precipitated an internal Armadillo switch from 'u32' to 'uword' and the
 # Armadillo extensions in mlpack depend on the use of 'uword' which is
 # undefined <= 2.4.0.
@@ -104,7 +110,12 @@ margins.  This package provides the Doxygen-generated documentation for mlpack.
 
 
 %build
+%if 0%{?rhel}
+%{cmake28} -D LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF .
+%else
 %{cmake} -D LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF .
+%endif
+
 make %{?_smp_mflags}
 # Build documentation ('doc' is not in the list of default targets).
 make doc
@@ -199,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/mlpack/
 
 %changelog
+* Wed Jan 02 2013 Ryan Curtin <gth671b at mail.gatech.edu> - 1.0.3-4
+- Use cmake28 in RHEL packages.
+
 * Wed Jan 02 2013 Dan HorĂ¡k <dan[at]danny.cz> - 1.0.3-3
 - Exclude s390, something doesn't like size_t being unsigned long
 


More information about the scm-commits mailing list