diff --git a/armadillo-3.930.1.tar.gz b/armadillo-3.930.1.tar.gz deleted file mode 100644 index d9f3b26..0000000 --- a/armadillo-3.930.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:221baada1bc571273881dd73ef1968dd838b538a639807bd5e1d3a2ae4b5cfd3 -size 3273899 diff --git a/armadillo-4.000.0.tar.gz b/armadillo-4.000.0.tar.gz new file mode 100644 index 0000000..56c4c0c --- /dev/null +++ b/armadillo-4.000.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b49aa86ce8db4257106b9d0f91352bfc1f7a819cee87e153778b507a0f45d78 +size 5470115 diff --git a/armadillo.changes b/armadillo.changes index 495cd3e..8490cae 100644 --- a/armadillo.changes +++ b/armadillo.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Wed Jan 8 04:40:56 UTC 2014 - badshah400@gmail.com + +- Armadillo no longer depends on boost libraries, and requires + arpack-ng instead; adapt build and run-time requirements + appropriately +- Fix baselibs.conf for so name version update +- Add libatlas3 dependencies as recommended by upstream. + +------------------------------------------------------------------- +Mon Jan 6 21:27:36 UTC 2014 - badshah400@gmail.com + +- Update to Version 4.000.0 (Feral Steamroller) + + added eigen decompositions of sparse matrices: eigs_sym() and + eigs_gen() + + added eigen decomposition for pair of matrices: eig_pair() + + added simpler forms of eig_gen() + + added condition number of matrices: cond() + + expanded find() to handle cubes + + expanded subcube views to access elements specified in a vector + + template argument for running_stat_vec expanded to accept + vector types + + more robust fast inverse of 4x4 matrices + + faster divide-and-conquer decompositions are now used by + default for eig_sym(), pinv(), princomp(), rank(), svd(), + svd_econ() + + the form inv(sympd(X)) no longer assumes that X is positive + definite; use inv_sympd() instead + + added MEX connector for interfacing Octave/Matlab with + Armadillo matrices (contributed by George Yammine) +- Packaging changes: + + SO version update to 4 + + Remove appropriate win64 examples instead of win32 + ------------------------------------------------------------------- Tue Dec 10 07:44:43 UTC 2013 - badshah400@gmail.com diff --git a/armadillo.spec b/armadillo.spec index 1a47d0b..fe1bb71 100644 --- a/armadillo.spec +++ b/armadillo.spec @@ -1,7 +1,7 @@ # # spec file for package armadillo # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,10 @@ # +%define soname libarmadillo4 + Name: armadillo -Version: 3.930.1 +Version: 4.000.0 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS License: MPL-2.0 @@ -25,11 +27,12 @@ Group: Development/Libraries/C and C++ Url: http://arma.sourceforge.net/ Source: http://downloads.sourceforge.net/arma/%{name}-%{version}.tar.gz Source2: baselibs.conf +BuildRequires: arpack-ng-devel BuildRequires: blas-devel -BuildRequires: boost-devel BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: lapack-devel +BuildRequires: libatlas3-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,11 +50,11 @@ This library is useful if C++ has been decided as the language of choice (due to speed and/or integration capabilities), rather than another language like Matlab or Octave. -%package -n libarmadillo3 +%package -n %{soname} Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS Group: System/Libraries -%description -n libarmadillo3 +%description -n %{soname} Armadillo is a C++ linear algebra library (matrix maths) aiming towards a good balance between speed and ease of use. Integer, floating point and complex numbers are supported, @@ -95,10 +98,11 @@ This package provides the documentation for armadillo. %package devel Summary: Development headers and documentation for the Armadillo C++ library Group: Development/Libraries/C and C++ +Requires: %{soname} = %{version} +Requires: arpack-ng-devel Requires: blas-devel -Requires: boost-devel Requires: lapack-devel -Requires: libarmadillo3 = %{version} +Requires: libatlas3-devel Requires: libstdc++-devel Recommends: %{name}-doc @@ -138,15 +142,15 @@ make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install rm -f examples/Makefile.cmake -rm -rf examples/example1_win32 -rm -rf examples/example2_win32 -rm -rf examples/lib_win32 +rm -rf examples/example1_win64.* +rm -rf examples/example2_win64.* +rm -rf examples/lib_win64 -%post -n libarmadillo3 -p /sbin/ldconfig +%post -n %{soname} -p /sbin/ldconfig -%postun -n libarmadillo3 -p /sbin/ldconfig +%postun -n %{soname} -p /sbin/ldconfig -%files -n libarmadillo3 +%files -n %{soname} %defattr(-,root,root) %{_libdir}/*.so.* diff --git a/baselibs.conf b/baselibs.conf index 3c46ed8..cd4d8bf 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libarmadillo3 +libarmadillo4 armadillo-devel requires -armadillo- - requires "libarmadillo3- = " + requires "libarmadillo4- = "