[mlpack-svn] r13332 - mlpack/conf/packages/mlpack/trunk/rpm

Sat Aug 4 18:03:50 EDT 2012

Author: rcurtin
Date: 2012-08-04 18:03:50 -0400 (Sat, 04 Aug 2012)
New Revision: 13332

Modified:
   mlpack/conf/packages/mlpack/trunk/rpm/armadillo.spec
   mlpack/conf/packages/mlpack/trunk/rpm/mlpack.spec
Log:
Update MLPACK RPM package based on reviewer comments.


Modified: mlpack/conf/packages/mlpack/trunk/rpm/armadillo.spec
===================================================================

--- mlpack/conf/packages/mlpack/trunk/rpm/armadillo.spec	2012-08-03 21:21:31 UTC (rev 13331)
+++ mlpack/conf/packages/mlpack/trunk/rpm/armadillo.spec	2012-08-04 22:03:50 UTC (rev 13332)
@@ -1,5 +1,5 @@
 Name:           armadillo
-Version:        2.4.0
+Version:        3.0.4
 Release:        1%{?dist}
 Summary:        Fast C++ matrix library with interfaces to LAPACK and ATLAS
 
@@ -93,7 +93,6 @@
 %{_libdir}/*.so
 %{_includedir}/armadillo
 %{_includedir}/armadillo_bits/
-%{_includedir}/armadillo_itpp
 %doc %{_docdir}/%{name}-%{version}/README.txt
 %doc %{_docdir}/%{name}-%{version}/index.html
 %doc %{_docdir}/%{name}-%{version}/examples/
@@ -101,6 +100,9 @@
 %{_datadir}/Armadillo/
 
 %changelog
+* Wed Jul 18 2012 Ryan Curtin <ryan at igglybob.com> - 3.0.4-1
+- spec updated for Armadillo 3.0.4
+
 * Fri Jul 06 2012 Sterling Peet - 2.4.0-1
 - spec updated for Armadillo 2.4.0
 

Modified: mlpack/conf/packages/mlpack/trunk/rpm/mlpack.spec
===================================================================
--- mlpack/conf/packages/mlpack/trunk/rpm/mlpack.spec	2012-08-03 21:21:31 UTC (rev 13331)
+++ mlpack/conf/packages/mlpack/trunk/rpm/mlpack.spec	2012-08-04 22:03:50 UTC (rev 13332)
@@ -1,9 +1,9 @@
 Name:           mlpack
 Version:        1.0.1
-Release:        2%{?dist}
-Summary:        A scalable, fast C++ machine learning library
+Release:        3%{?dist}
+Summary:        Scalable, fast C++ machine learning library
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        LGPLv3+
 URL:            http://www.mlpack.org
 Source0:        http://www.mlpack.org/files/%{name}-%{version}.tar.gz
@@ -20,9 +20,19 @@
 # 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).
+# 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.6 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
@@ -36,6 +46,9 @@
 # in repos.
 BuildRequires:  txt2man
 
+# 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.
 Requires:       armadillo >= 2.4.0
 Requires:       libxml2
 Requires:       boost, boost-program-options, boost-math
@@ -52,8 +65,8 @@
 # Executables.
 %package bin
 Summary:        Command-line executables for mlpack (machine learning library)
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Group:          Applications/Engineering
+Requires:       %{name}%{_isa} = %{version}-%{release}
 
 %description bin
 mlpack is a C++ machine learning library with emphasis on scalability, speed,
@@ -67,7 +80,7 @@
 # Development headers.
 %package devel
 Summary:        Development headers for mlpack (C++ machine learning library)
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       armadillo-devel >= 2.4.0
 Requires:       boost-devel, boost-program-options, boost-math
@@ -89,6 +102,8 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -100,67 +115,83 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Rename executables to mlpack_* to avoid possible naming collisions.  Upstream
+# bug report http://trac.research.cc.gatech.edu/fastlab/ticket/236.
+for i in `ls $RPM_BUILD_ROOT/%{_bindir}`
+do
+  %{__mv} $RPM_BUILD_ROOT/%{_bindir}/$i $RPM_BUILD_ROOT/%{_bindir}/mlpack_$i;
+done
+for i in `ls $RPM_BUILD_ROOT/%{_mandir}/man1`
+do
+  %{__mv} $RPM_BUILD_ROOT/%{_mandir}/man1/$i $RPM_BUILD_ROOT/%{_mandir}/man1/mlpack_$i;
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
-%{_libdir}/libmlpack.so
 %{_libdir}/libmlpack.so.1
 %{_libdir}/libmlpack.so.1.0.1
 
 %files bin
 %defattr(-,root,root,-)
-%{_bindir}/allknn
-%{_bindir}/allkfn
-%{_bindir}/emst
-%{_bindir}/gmm
-%{_bindir}/hmm_generate
-%{_bindir}/hmm_loglik
-%{_bindir}/hmm_train
-%{_bindir}/hmm_viterbi
-%{_bindir}/kernel_pca
-%{_bindir}/kmeans
-%{_bindir}/lars
-%{_bindir}/linear_regression
-%{_bindir}/local_coordinate_coding
-%{_bindir}/nbc
-%{_bindir}/nca
-%{_bindir}/pca
-%{_bindir}/radical
-%{_bindir}/range_search
-%{_bindir}/sparse_coding
-%doc %{_mandir}/man1/allknn.1.gz
-%doc %{_mandir}/man1/allkfn.1.gz
-%doc %{_mandir}/man1/emst.1.gz
-%doc %{_mandir}/man1/gmm.1.gz
-%doc %{_mandir}/man1/hmm_generate.1.gz
-%doc %{_mandir}/man1/hmm_loglik.1.gz
-%doc %{_mandir}/man1/hmm_train.1.gz
-%doc %{_mandir}/man1/hmm_viterbi.1.gz
-%doc %{_mandir}/man1/kernel_pca.1.gz
-%doc %{_mandir}/man1/kmeans.1.gz
-%doc %{_mandir}/man1/lars.1.gz
-%doc %{_mandir}/man1/linear_regression.1.gz
-%doc %{_mandir}/man1/local_coordinate_coding.1.gz
-%doc %{_mandir}/man1/nbc.1.gz
-%doc %{_mandir}/man1/nca.1.gz
-%doc %{_mandir}/man1/pca.1.gz
-%doc %{_mandir}/man1/radical.1.gz
-%doc %{_mandir}/man1/range_search.1.gz
-%doc %{_mandir}/man1/sparse_coding.1.gz
+%{_bindir}/mlpack_allknn
+%{_bindir}/mlpack_allkfn
+%{_bindir}/mlpack_emst
+%{_bindir}/mlpack_gmm
+%{_bindir}/mlpack_hmm_generate
+%{_bindir}/mlpack_hmm_loglik
+%{_bindir}/mlpack_hmm_train
+%{_bindir}/mlpack_hmm_viterbi
+%{_bindir}/mlpack_kernel_pca
+%{_bindir}/mlpack_kmeans
+%{_bindir}/mlpack_lars
+%{_bindir}/mlpack_linear_regression
+%{_bindir}/mlpack_local_coordinate_coding
+%{_bindir}/mlpack_nbc
+%{_bindir}/mlpack_nca
+%{_bindir}/mlpack_pca
+%{_bindir}/mlpack_radical
+%{_bindir}/mlpack_range_search
+%{_bindir}/mlpack_sparse_coding
+%{_mandir}/man1/mlpack_allknn.1*
+%{_mandir}/man1/mlpack_allkfn.1*
+%{_mandir}/man1/mlpack_emst.1*
+%{_mandir}/man1/mlpack_gmm.1*
+%{_mandir}/man1/mlpack_hmm_generate.1*
+%{_mandir}/man1/mlpack_hmm_loglik.1*
+%{_mandir}/man1/mlpack_hmm_train.1*
+%{_mandir}/man1/mlpack_hmm_viterbi.1*
+%{_mandir}/man1/mlpack_kernel_pca.1*
+%{_mandir}/man1/mlpack_kmeans.1*
+%{_mandir}/man1/mlpack_lars.1*
+%{_mandir}/man1/mlpack_linear_regression.1*
+%{_mandir}/man1/mlpack_local_coordinate_coding.1*
+%{_mandir}/man1/mlpack_nbc.1*
+%{_mandir}/man1/mlpack_nca.1*
+%{_mandir}/man1/mlpack_pca.1*
+%{_mandir}/man1/mlpack_radical.1*
+%{_mandir}/man1/mlpack_range_search.1*
+%{_mandir}/man1/mlpack_sparse_coding.1*
 
 %files devel
 %defattr(-,root,root,-)
+%{_libdir}/libmlpack.so
 %{_includedir}/mlpack/
-%{_includedir}/mlpack/core.hpp
-%{_includedir}/mlpack/core/
-%{_includedir}/mlpack/methods/
 
 %changelog
-* Thu Jul 21 2012 Sterling Lewis Peet <sterling.peet at gatech.edu - 1.0.1-2
+* Sun Jul 29 2012 Ryan Curtin <gth671b at mail.gatech.edu> - 1.0.1-3
+- Fix group names for packages.
+- Comment patches more verbosely.
+- Rename exectuables to mlpack_* to avoid possible naming conflicts.
+
+* Thu Jul 21 2012 Sterling Lewis Peet <sterling.peet at gatech.edu> - 1.0.1-2
 - Include GetKernelMatrix patch so that mlpack builds using fedora flags.
 
 * Thu Mar 08 2012 Ryan Curtin <gth671b at mail.gatech.edu> - 1.0.1-1


