From 5d7bfcabd5a24b9194e79b5e26ea2f526af86ff99a4f1097b7c195c80a694a10 Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <badshah400@gmail.com>
Date: Sun, 23 Dec 2012 17:07:13 +0000
Subject: [PATCH] Accepting request 146259 from
 home:Dmitry_R:branches:devel:libraries:c_c++

update to version 3.6.1

OBS-URL: https://build.opensuse.org/request/show/146259
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/armadillo?expand=0&rev=62
---
 armadillo-3.4.4.tar.gz |  3 ---
 armadillo-3.6.1.tar.gz |  3 +++
 armadillo.changes      | 20 ++++++++++++++++++++
 armadillo.spec         |  6 +++---
 4 files changed, 26 insertions(+), 6 deletions(-)
 delete mode 100644 armadillo-3.4.4.tar.gz
 create mode 100644 armadillo-3.6.1.tar.gz

diff --git a/armadillo-3.4.4.tar.gz b/armadillo-3.4.4.tar.gz
deleted file mode 100644
index 56b60ce..0000000
--- a/armadillo-3.4.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef94e12556421fa62ba7734f8b18bb12c188f43dd6192d3648a28e8d154e6ba7
-size 3006964
diff --git a/armadillo-3.6.1.tar.gz b/armadillo-3.6.1.tar.gz
new file mode 100644
index 0000000..5af1b9a
--- /dev/null
+++ b/armadillo-3.6.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ca5e0542754b70b1fb3008cc5f66c9152008f78ed89cee24a2b8e2c894f27a0
+size 3015353
diff --git a/armadillo.changes b/armadillo.changes
index b0162b3..8b123df 100644
--- a/armadillo.changes
+++ b/armadillo.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Dec 21 18:03:59 UTC 2012 - dmitry@roshchin.org
+
+- Update to version 3.6.1
+  Changes in 3.6.1
+  * faster trace()
+  * fix for handling sparse matrices by dot()
+  * fixes for interactions between sparse and dense matrices
+  Changes in 3.6.0
+  * faster handling of compound expressions with submatrices
+    and subcubes
+  * added support for loading matrices as text files with
+    NaN and Inf elements
+  * added stable_sort_index(), which preserves the relative
+    order of elements with equivalent values
+  * added handling of sparse matrices by mean(), var(),
+    norm(), abs(), square(), sqrt()
+  * added saving and loading of sparse matrices in 
+    arma_binary format
+
 -------------------------------------------------------------------
 Thu Nov 22 16:46:33 UTC 2012 - cgiboudeaux@gmx.com
 
diff --git a/armadillo.spec b/armadillo.spec
index 275c551..b7d10d2 100644
--- a/armadillo.spec
+++ b/armadillo.spec
@@ -17,7 +17,7 @@
 
 
 Name:           armadillo
-Version:        3.4.4
+Version:        3.6.1
 Release:        0
 Summary:        Fast C++ matrix library with interfaces to LAPACK and ATLAS
 License:        LGPL-3.0+
@@ -108,10 +108,10 @@ for i in `ls examples/*.cpp`; do sed -i 's/\r//' $i; done
 cmake . \
         -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix}\
         -DINSTALL_LIB_DIR:PATH=%{_libdir}
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__make} DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install
 rm -f examples/Makefile.cmake
 rm -rf examples/example1_win32
 rm -rf examples/example2_win32