From ee81254d14b3199a7eb574b73c35973b6a67584141eebcc66d47935cf07df578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Fri, 4 Aug 2017 12:28:01 +0000
Subject: [PATCH 1/2] Accepting request 514545 from
 home:badshah400:branches:devel:libraries:c_c++

- Update to version 7.960.0:
  + Faster randn() when using OpenMP.
  + Faster gmm_diag class, for Gaussian mixture models with
    diagonal covariance matrices.
  + Added .sum_log_p() to the gmm_diag class.
  + Added gmm_full class, for Gaussian mixture models with full
    covariance matrices.
  + Expanded .each_slice() to optionally use OpenMP for
    multi-threaded execution.
- Drop %%check section entirely, this is not expected to work
  going forward. Also drop armadillo-tests.patch, which was meant
  for the tests in the %%check section.

OBS-URL: https://build.opensuse.org/request/show/514545
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/armadillo?expand=0&rev=213
---
 armadillo-7.950.1.tar.xz |  3 --
 armadillo-7.960.0.tar.xz |  3 ++
 armadillo-tests.patch    | 88 ----------------------------------------
 armadillo.changes        | 16 ++++++++
 armadillo.spec           | 12 +-----
 5 files changed, 20 insertions(+), 102 deletions(-)
 delete mode 100644 armadillo-7.950.1.tar.xz
 create mode 100644 armadillo-7.960.0.tar.xz
 delete mode 100644 armadillo-tests.patch

diff --git a/armadillo-7.950.1.tar.xz b/armadillo-7.950.1.tar.xz
deleted file mode 100644
index 521aa6c..0000000
--- a/armadillo-7.950.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a32da32a0ea420b8397a53e4b40ed279c1a5fc791dd492a2ced81ffb14ad0d1b
-size 4022716
diff --git a/armadillo-7.960.0.tar.xz b/armadillo-7.960.0.tar.xz
new file mode 100644
index 0000000..97e4474
--- /dev/null
+++ b/armadillo-7.960.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ea919c4312ec43d454f61fdd0e34282f94739eb51adc78d21176717143cfd32
+size 4438972
diff --git a/armadillo-tests.patch b/armadillo-tests.patch
deleted file mode 100644
index 94cc410..0000000
--- a/armadillo-tests.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Index: armadillo-7.900.1/tests/Makefile.in
-===================================================================
---- /dev/null
-+++ armadillo-7.900.1/tests/Makefile.in
-@@ -0,0 +1,38 @@
-+
-+LIB_FLAGS = -L@PROJECT_SOURCE_DIR@ -larmadillo
-+
-+ifeq (${ARMA_USE_LAPACK},true)
-+  LIB_FLAGS += -llapack
-+endif
-+ifeq (${ARMA_USE_BLAS},true)
-+  LIB_FLAGS += -lblas
-+endif
-+ifeq (${ARMA_USE_SUPERLU},true)
-+  LIB_FLAGS += -lsuperlu
-+endif
-+ifeq (${ARMA_USE_ARPACK},true)
-+  LIB_FLAGS += -larpack
-+endif
-+
-+#LIB_FLAGS = -lblas -llapack
-+#LIB_FLAGS = -lopenblas -llapack
-+
-+CXX_FLAGS = -I@PROJECT_SOURCE_DIR@/include -std=c++11 -Wshadow -Wall -pedantic -O0
-+#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -DARMA_DONT_USE_WRAPPER
-+#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O2
-+
-+OBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-+
-+%.o: %.cpp $(DEPS)
-+	$(CXX) $(CXX_FLAGS) -o $@ -c $<
-+
-+main: $(OBJECTS)
-+	$(CXX) $(CXX_FLAGS) -o $@ $(OBJECTS) $(LIB_FLAGS)
-+
-+
-+all: main
-+
-+.PHONY: clean
-+
-+clean:
-+	rm -f main *.o
-Index: armadillo-7.900.1/CMakeLists.txt
-===================================================================
---- armadillo-7.900.1.orig/CMakeLists.txt
-+++ armadillo-7.900.1/CMakeLists.txt
-@@ -437,6 +437,10 @@ set(ARMADILLO_LIB_DIR      "${PROJECT_BI
- set(ARMADILLO_CMAKE_DIR    "${PROJECT_BINARY_DIR}")
- 
- 
-+# Configure tests/Makefile.in for running tests without installing first
-+message(STATUS "Configuring tests/Makefile")
-+configure_file(${PROJECT_SOURCE_DIR}/tests/Makefile.in ${PROJECT_SOURCE_DIR}/tests/Makefile)
-+
- message(STATUS "Generating '${PROJECT_BINARY_DIR}/ArmadilloConfig.cmake'")
- # copy/change config and configVersion file (modify only the @xyz@ variables)
- configure_file(${PROJECT_SOURCE_DIR}/cmake_aux/InstallFiles/ArmadilloConfig.cmake.in
-Index: armadillo-7.900.1/tests/Makefile
-===================================================================
---- armadillo-7.900.1.orig/tests/Makefile
-+++ armadillo-7.900.1/tests/Makefile
-@@ -1,25 +0,0 @@
--
--LIB_FLAGS = -larmadillo
--#LIB_FLAGS = -lblas -llapack 
--#LIB_FLAGS = -lopenblas -llapack 
--
--CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0
--#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -fopenmp
--#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -DARMA_DONT_USE_WRAPPER
--#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O2
--
--OBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
--
--%.o: %.cpp $(DEPS)
--	$(CXX) $(CXX_FLAGS) -o $@ -c $< $
--
--main: $(OBJECTS)
--	$(CXX) $(CXX_FLAGS) -o $@ $(OBJECTS) $(LIB_FLAGS)
--
--
--all: main
--
--.PHONY: clean
--
--clean:
--	rm -f main *.o
diff --git a/armadillo.changes b/armadillo.changes
index fb83548..945c63a 100644
--- a/armadillo.changes
+++ b/armadillo.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Fri Aug  4 10:36:47 UTC 2017 - badshah400@gmail.com
+
+- Update to version 7.960.0:
+  + Faster randn() when using OpenMP.
+  + Faster gmm_diag class, for Gaussian mixture models with
+    diagonal covariance matrices.
+  + Added .sum_log_p() to the gmm_diag class.
+  + Added gmm_full class, for Gaussian mixture models with full
+    covariance matrices.
+  + Expanded .each_slice() to optionally use OpenMP for
+    multi-threaded execution.
+- Drop %%check section entirely, this is not expected to work
+  going forward. Also drop armadillo-tests.patch, which was meant
+  for the tests in the %%check section.
+
 -------------------------------------------------------------------
 Wed Jun 21 12:07:23 UTC 2017 - badshah400@gmail.com
 
diff --git a/armadillo.spec b/armadillo.spec
index c7fe7aa..177ad73 100644
--- a/armadillo.spec
+++ b/armadillo.spec
@@ -18,7 +18,7 @@
 
 %define soname libarmadillo7
 Name:           armadillo
-Version:        7.950.1
+Version:        7.960.0
 Release:        0
 Summary:        Fast C++ matrix library with interfaces to LAPACK and ATLAS
 License:        Apache-2.0
@@ -26,8 +26,6 @@ Group:          Development/Libraries/C and C++
 Url:            http://arma.sourceforge.net/
 Source:         http://downloads.sourceforge.net/arma/%{name}-%{version}.tar.xz
 Source2:        baselibs.conf
-# PATCH-FEATURE-OPENSUSE armadillo-tests.patch badshah400@gmail.com -- Generate tests/Makefile by configuring tests/Makefile.in using cmake so that the tests can be run before actually installing the library; patch sent upstream
-Patch1:         armadillo-tests.patch
 BuildRequires:  arpack-ng-devel
 BuildRequires:  blas-devel
 BuildRequires:  cmake
@@ -129,7 +127,6 @@ and user documentation (reference guide).
 
 %prep
 %setup -q
-%patch1 -p1
 #Convert DOS end-of-line to UNIX end-of-line
 sed -i 's/\r//' README.txt
 sed -i 's/\r//' LICENSE.txt
@@ -150,13 +147,6 @@ rm -rf examples/example1_win64.*
 rm -rf examples/example2_win64.*
 rm -rf examples/lib_win64
 
-# Drop tests because upstream acknowledges some tests are intended to fail without ARPACK
-#%%check
-#pushd tests
-#make %%{?_smp_mflags}
-#./main
-#popd
-
 %post -n %{soname} -p /sbin/ldconfig
 
 %postun -n %{soname} -p /sbin/ldconfig

From 4f5024b78a410383311efb7440b284f2980399fbce6a72a1cf7f88633c5dd39c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 17 Aug 2017 08:09:08 +0000
Subject: [PATCH 2/2] Accepting request 517234 from
 home:badshah400:branches:devel:libraries:c_c++

- Update to version 7.960.1:
  + Undocumented bug fixes.

OBS-URL: https://build.opensuse.org/request/show/517234
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/armadillo?expand=0&rev=214
---
 armadillo-7.960.0.tar.xz | 3 ---
 armadillo-7.960.1.tar.xz | 3 +++
 armadillo.changes        | 6 ++++++
 armadillo.spec           | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)
 delete mode 100644 armadillo-7.960.0.tar.xz
 create mode 100644 armadillo-7.960.1.tar.xz

diff --git a/armadillo-7.960.0.tar.xz b/armadillo-7.960.0.tar.xz
deleted file mode 100644
index 97e4474..0000000
--- a/armadillo-7.960.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ea919c4312ec43d454f61fdd0e34282f94739eb51adc78d21176717143cfd32
-size 4438972
diff --git a/armadillo-7.960.1.tar.xz b/armadillo-7.960.1.tar.xz
new file mode 100644
index 0000000..20f03a3
--- /dev/null
+++ b/armadillo-7.960.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57de6b9eb547f168e5dd2d2736c75b609bb2d1761120f608ff6530d7247082ff
+size 4438836
diff --git a/armadillo.changes b/armadillo.changes
index 945c63a..df7f9a9 100644
--- a/armadillo.changes
+++ b/armadillo.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 16 15:26:57 UTC 2017 - badshah400@gmail.com
+
+- Update to version 7.960.1:
+  + Undocumented bug fixes. 
+
 -------------------------------------------------------------------
 Fri Aug  4 10:36:47 UTC 2017 - badshah400@gmail.com
 
diff --git a/armadillo.spec b/armadillo.spec
index 177ad73..000db6f 100644
--- a/armadillo.spec
+++ b/armadillo.spec
@@ -18,7 +18,7 @@
 
 %define soname libarmadillo7
 Name:           armadillo
-Version:        7.960.0
+Version:        7.960.1
 Release:        0
 Summary:        Fast C++ matrix library with interfaces to LAPACK and ATLAS
 License:        Apache-2.0