[mlpack] Update patch, and rebuild spec for newest version.
rcurtin
rcurtin at fedoraproject.org
Wed Jul 30 18:16:35 UTC 2014
commit 0f82523657181af1d977a880cc79f468dc85e61b
Author: Ryan Curtin <gth671b at mail.gatech.edu>
Date: Wed Jul 30 14:16:02 2014 -0400
Update patch, and rebuild spec for newest version.
.gitignore | 1 +
cmake_libdir.patch | 22 +++++++++++++---------
mlpack.spec | 16 ++++++++++------
3 files changed, 24 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 73a9bdf..2d9dbce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/mlpack-1.0.6.tar.gz
/mlpack-1.0.7.tar.gz
/mlpack-1.0.8.tar.gz
+/mlpack-1.0.9.tar.gz
diff --git a/cmake_libdir.patch b/cmake_libdir.patch
index 0a29e73..f913f13 100644
--- a/cmake_libdir.patch
+++ b/cmake_libdir.patch
@@ -1,8 +1,10 @@
---- mlpack-1.0.4/CMakeLists.txt.old 2013-02-08 16:45:07.185157904 -0500
-+++ mlpack-1.0.4/CMakeLists.txt 2013-02-08 16:45:33.120175972 -0500
-@@ -8,6 +8,12 @@
+Index: mlpack-1.0.9/CMakeLists.txt
+===================================================================
+--- mlpack-1.0.9/CMakeLists.txt (revision 16892)
++++ mlpack-1.0.9/CMakeLists.txt (working copy)
+@@ -7,6 +7,12 @@
+ option(PROFILE "Compile with profiling information" OFF)
option(ARMA_EXTRA_DEBUG "Compile with extra Armadillo debugging symbols." OFF)
- option(MATLAB_BINDINGS "Compile MATLAB bindings if MATLAB is found." OFF)
+if(LIBDIR)
+ message(STATUS "Setting library install directory to ${LIBDIR}.")
@@ -13,9 +15,11 @@
# This is as of yet unused.
#option(PGO "Use profile-guided optimization if not a debug build" ON)
---- mlpack-1.0.4/src/mlpack/CMakeLists.txt.old 2013-02-08 16:45:45.218117489 -0500
-+++ mlpack-1.0.4/src/mlpack/CMakeLists.txt 2013-02-08 16:45:59.938263211 -0500
-@@ -62,8 +62,8 @@
+Index: mlpack-1.0.9/src/mlpack/CMakeLists.txt
+===================================================================
+--- mlpack-1.0.9/src/mlpack/CMakeLists.txt (revision 16894)
++++ mlpack-1.0.9/src/mlpack/CMakeLists.txt (working copy)
+@@ -69,8 +69,8 @@
# be entered...
install(TARGETS mlpack
RUNTIME DESTINATION bin
@@ -24,5 +28,5 @@
+ LIBRARY DESTINATION ${LIBDIR}
+ ARCHIVE DESTINATION ${LIBDIR})
- # For 'make test'.
- add_custom_target(test
+ add_dependencies(mlpack mlpack_headers)
+
diff --git a/mlpack.spec b/mlpack.spec
index 80f5222..8f355b2 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
Name: mlpack
-Version: 1.0.8
-Release: 4%{?dist}
+Version: 1.0.9
+Release: 1%{?dist}
Summary: Scalable, fast C++ machine learning library
Group: System Environment/Libraries
@@ -27,12 +27,9 @@ BuildRequires: cmake28 >= 2.8.5
BuildRequires: cmake >= 2.8.5
%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.
BuildRequires: armadillo-devel >= 3.6.0
BuildRequires: libxml2-devel
-BuildRequires: boost-devel, boost-program-options, boost-math
+BuildRequires: boost-devel, boost-program-options, boost-math >= 1.49
BuildRequires: lapack-devel
# For generating man pages (CMake configuration takes care of this assuming
# txt2man is installed). It is possible that we could just add all the man
@@ -170,6 +167,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/mlpack_allkfn
%{_bindir}/mlpack_allkrann
%{_bindir}/mlpack_cf
+%{_bindir}/mlpack_decision_stump
%{_bindir}/mlpack_det
%{_bindir}/mlpack_emst
%{_bindir}/mlpack_fastmks
@@ -189,6 +187,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/mlpack_nca
%{_bindir}/mlpack_nmf
%{_bindir}/mlpack_pca
+%{_bindir}/mlpack_perceptron
%{_bindir}/mlpack_radical
%{_bindir}/mlpack_range_search
%{_bindir}/mlpack_sparse_coding
@@ -196,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/mlpack_allkfn.1*
%{_mandir}/man1/mlpack_allkrann.1*
%{_mandir}/man1/mlpack_cf.1*
+%{_mandir}/man1/mlpack_decision_stump.1*
%{_mandir}/man1/mlpack_det.1*
%{_mandir}/man1/mlpack_emst.1*
%{_mandir}/man1/mlpack_fastmks.1*
@@ -215,6 +215,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/mlpack_nca.1*
%{_mandir}/man1/mlpack_nmf.1*
%{_mandir}/man1/mlpack_pca.1*
+%{_mandir}/man1/mlpack_perceptron.1*
%{_mandir}/man1/mlpack_radical.1*
%{_mandir}/man1/mlpack_range_search.1*
%{_mandir}/man1/mlpack_sparse_coding.1*
@@ -229,6 +230,9 @@ rm -rf $RPM_BUILD_ROOT
%{our_docdir}
%changelog
+* Mon Jul 28 2014 Ryan Curtin <ryan at ratml.org> - 1.0.9-1
+- Update to latest stable release.
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list