From 6c2a5c1d7838b2bae638f52cab017a76813dc313c9207e08df8f70f3f6538153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 1 Mar 2013 18:10:09 +0000 Subject: [PATCH] Accepting request 157020 from home:Dmitry_R:branches:devel:libraries:c_c++ OBS-URL: https://build.opensuse.org/request/show/157020 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/armadillo?expand=0&rev=67 --- armadillo-3.6.3.tar.gz | 3 --- armadillo-3.800.0.tar.gz | 3 +++ armadillo.changes | 16 +++++++++++++ armadillo.spec | 49 ++++++++++++++++++++++++++++++++-------- 4 files changed, 58 insertions(+), 13 deletions(-) delete mode 100644 armadillo-3.6.3.tar.gz create mode 100644 armadillo-3.800.0.tar.gz diff --git a/armadillo-3.6.3.tar.gz b/armadillo-3.6.3.tar.gz deleted file mode 100644 index 55d0991..0000000 --- a/armadillo-3.6.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52da899a8569ffb8b504229eccdd1031a7eb28c888c4b5c3e256cb9f60ca5711 -size 3014934 diff --git a/armadillo-3.800.0.tar.gz b/armadillo-3.800.0.tar.gz new file mode 100644 index 0000000..a1fce68 --- /dev/null +++ b/armadillo-3.800.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b3fecef67a5df1f1752f3e242f9148044c16fb76c8528a779aec4d6e1466004 +size 3198790 diff --git a/armadillo.changes b/armadillo.changes index c3bea3f..07f4606 100644 --- a/armadillo.changes +++ b/armadillo.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Mar 1 06:25:15 UTC 2013 - dmitry_r@opensuse.org + +- Update to version 3.8.0 + * Armadillo is now licensed using the Mozilla Public License 2.0 + * added .imbue() for filling a matrix/cube with values provided + by a functor or lambda expression + * added .swap() for swapping contents with another matrix + * added .transform() for transforming a matrix/cube using a + functor or lambda expression + * added round() for rounding matrix elements towards nearest integer + * faster find() + * fixes for handling non-square matrices by qr() and qr_econ() + * minor fixes for handling empty matrices + * reduction of pedantic compiler warnings + ------------------------------------------------------------------- Wed Feb 20 09:24:21 UTC 2013 - dmitry_r@opensuse.org diff --git a/armadillo.spec b/armadillo.spec index 1748772..41dfe21 100644 --- a/armadillo.spec +++ b/armadillo.spec @@ -17,10 +17,10 @@ Name: armadillo -Version: 3.6.3 +Version: 3.800.0 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS -License: LGPL-3.0+ +License: MPL-2.0 Group: Development/Libraries/C and C++ Url: http://arma.sourceforge.net/ Source: http://download.sourceforge.net/arma/%{name}-%{version}.tar.gz @@ -47,9 +47,9 @@ 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 -Summary: Shared libraries for armadillo -Group: Development/Libraries/C and C++ +%package -n libarmadillo3 +Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS +Group: System/Libraries %description -n libarmadillo3 Armadillo is a C++ linear algebra library (matrix maths) @@ -68,7 +68,31 @@ than another language like Matlab or Octave. This package provides the shared libraries for armadillo. -%package devel +%package doc +Summary: Documentation for %{name} +Group: Documentation/Other +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif + +%description doc +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, +as well as a subset of trigonometric and statistics functions. +Various matrix decompositions are provided through optional +integration with LAPACK and ATLAS libraries. +A delayed evaluation approach is employed (during compile time) +to combine several operations into one and reduce (or eliminate) +the need for temporaries. This is accomplished through recursive +templates and template meta-programming. +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. + +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: blas-devel @@ -76,8 +100,9 @@ Requires: boost-devel Requires: lapack-devel Requires: libarmadillo3 = %{version} Requires: libstdc++-devel +Recommends: %{name}-doc -%description devel +%description devel 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, @@ -101,7 +126,7 @@ and user documentation (reference guide). #Convert DOS end-of-line to UNIX end-of-line sed -i 's/\r//' README.txt sed -i 's/\r//' LICENSE.txt -for i in `ls licenses/`; do sed -i 's/\r//' licenses/$i ; done +# for i in `ls licenses/`; do sed -i 's/\r//' licenses/$i ; done for i in `ls examples/*.cpp`; do sed -i 's/\r//' $i; done %build @@ -124,7 +149,12 @@ rm -rf examples/lib_win32 %files -n libarmadillo3 %defattr(-,root,root) %{_libdir}/*.so.* -%doc LICENSE.txt licenses + +%files doc +%defattr(-,root,root) +%doc armadillo_nicta_2010.pdf +%doc rcpp_armadillo_csda_2013.pdf +%doc LICENSE.txt README.txt index.html examples/ docs.html %files devel %defattr(-,root,root) @@ -132,6 +162,5 @@ rm -rf examples/lib_win32 %{_includedir}/armadillo %{_includedir}/armadillo_bits/ %{_datadir}/Armadillo/ -%doc README.txt index.html examples/ docs.html %changelog