From 2847c02977d35c382c95ad0229cb6185059a35d3 Mon Sep 17 00:00:00 2001 From: ryan Date: Jan 01 2013 19:01:31 +0000 Subject: Update patch for 1.0.3 and update spec file to mlpack 1.0.3. --- diff --git a/cmake_libdir.patch b/cmake_libdir.patch index 1de8c75..8f7c31a 100644 --- a/cmake_libdir.patch +++ b/cmake_libdir.patch @@ -1,9 +1,9 @@ ---- mlpack-1.0.1/CMakeLists.txt 2012-03-07 23:35:40.000000000 -0500 -+++ mlpack-1.0.1/CMakeLists.txt.new 2012-03-07 23:37:32.000000000 -0500 -@@ -75,6 +75,12 @@ - option(PROFILE "Compile with profiling information" ON) +--- mlpack-1.0.3/CMakeLists.txt 2012-08-15 13:41:43.000000000 -0400 ++++ mlpack-1.0.3/CMakeLists.txt.new 2013-01-01 13:56:31.569887094 -0500 +@@ -7,6 +7,12 @@ + option(PROFILE "Compile with profiling information" OFF) option(ARMA_EXTRA_DEBUG "Compile with extra Armadillo debugging symbols." OFF) - + +if(LIBDIR) + message(STATUS "Setting library install directory to ${LIBDIR}.") +else(LIBDIR) @@ -12,10 +12,10 @@ + # This is as of yet unused. #option(PGO "Use profile-guided optimization if not a debug build" ON) - ---- mlpack-1.0.1/src/mlpack/CMakeLists.txt 2012-03-07 23:35:47.000000000 -0500 -+++ mlpack-1.0.1/src/mlpack/CMakeLists.txt.new 2012-03-07 23:36:03.000000000 -0500 -@@ -55,8 +55,8 @@ + +--- mlpack-1.0.3/src/mlpack/CMakeLists.txt 2012-03-13 14:16:40.000000000 -0400 ++++ mlpack-1.0.3/src/mlpack/CMakeLists.txt.new 2013-01-01 13:55:59.376413429 -0500 +@@ -62,8 +62,8 @@ # be entered... install(TARGETS mlpack RUNTIME DESTINATION bin @@ -23,6 +23,6 @@ - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION ${LIBDIR} + ARCHIVE DESTINATION ${LIBDIR}) - + # For 'make test'. add_custom_target(test diff --git a/mlpack.spec b/mlpack.spec index fd99247..d533f54 100644 --- a/mlpack.spec +++ b/mlpack.spec @@ -1,6 +1,6 @@ Name: mlpack -Version: 1.0.1 -Release: 5%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: Scalable, fast C++ machine learning library Group: System Environment/Libraries @@ -13,26 +13,6 @@ Source0: http://www.mlpack.org/files/%{name}-%{version}.tar.gz # be fixed by mlpack 1.0.2. Patch0: cmake_libdir.patch -# Oversight means that the rule which says "install range_search to bin/" didn't -# get there. -Patch1: range_search_install.patch - -# The GetKernelMatrix patch fixes a bug where a function was called before -# it was ever declared. This isn't a problem in certain GCC settings, but -# in the Fedora setting it throws an error (which is easily fixed by that -# patch). Fixed upstream in trunk (not 1.0.1). -Patch2: getkernelmatrix_definition.patch - -# More recent Armadillo versions require specific calls to arma::as_scalar(). -# Fixed upstream in trunk (not 1.0.1). -Patch3: fully_qualified_as_scalar.patch - -# The hacked-in sparse support for Armadillo in mlpack 1.0.1 does not work with -# recent Armadillo versions. That support becomes irrelevant with the -# impending 3.4 release so the issue is not fixed in trunk due to its pending -# obsolescence. -Patch4: no_sparse_tests.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.8.0 @@ -207,6 +187,10 @@ rm -rf $RPM_BUILD_ROOT %{_docdir}/mlpack/ %changelog +* Tue Jan 01 2013 Ryan Curtin - 1.0.3-1 +- Update to version 1.0.3. +- Remove now-unnecessary packages. + * Tue Sep 26 2012 Ryan Curtin - 1.0.1-5 - Simplify LICENSE.txt installation. - Install doxygen documentation. diff --git a/sources b/sources index 158ffda..fe0e9f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ecf9279fc8e92836aeb838c127ab79f6 mlpack-1.0.1.tar.gz +9c61f73e2c479315f8270b205315df23 mlpack-1.0.3.tar.gz