Accepting request 447075 from home:badshah400:branches:devel:libraries:c_c++

- Update to version 7.600.1:
- Drop armadillo-install-pkgconfig.patch: resolved upstream.

OBS-URL: https://build.opensuse.org/request/show/447075
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/armadillo?expand=0&rev=202

armadillo-7.500.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bdde22b47cc9718a05762300828ba4e086aa0527970e4ce08eb08677fb2623ea
-size 3994336

armadillo-7.600.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3a35c2a56dc706e9c413438d5b3063a0df2141515efaf2d1170d1944573afb7
+size 3997480

armadillo-install-pkgconfig.patch

@@ -1,66 +0,0 @@
-Index: armadillo-7.500.0/misc/armadillo.pc.in
-===================================================================
---- /dev/null
-+++ armadillo-7.500.0/misc/armadillo.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=@INSTALL_LIB_DIR@
-+includedir=@INSTALL_INCLUDE_DIR@
-+
-+Name: armadillo
-+Description: A fast and user-friendly C++ linear algebra library
-+URL: http://arma.sourceforge.net
-+Version: @ARMA_VERSION_MAJOR@.@ARMA_VERSION_MINOR@.@ARMA_VERSION_PATCH@
-+Cflags: -I${includedir}
-+Libs: -L${libdir} -larmadillo
-Index: armadillo-7.500.0/CMakeLists.txt
-===================================================================
---- armadillo-7.500.0.orig/CMakeLists.txt
-+++ armadillo-7.500.0/CMakeLists.txt
-@@ -270,6 +269,11 @@ if(DETECT_HDF5)
-   endif()
- endif()
- 
-+# Install pkgconfig file if pkg-config is found on system
-+find_package(PkgConfig)
-+if (PKG_CONFIG_FOUND)
-+  set(ARMA_INSTALL_PKGCONFIG true)
-+endif()
- 
- include(ARMA_FindARPACK)
- message(STATUS "ARPACK_FOUND = ${ARPACK_FOUND}")
-@@ -403,6 +407,11 @@ if(NOT INSTALL_BIN_DIR)
-   set(INSTALL_BIN_DIR "bin")
- endif()
- 
-+# pkgconfig install dir
-+if(ARMA_INSTALL_PKGCONFIG)
-+  set(PKGCONFIG_DIR ${INSTALL_LIB_DIR}/pkgconfig)
-+endif()
-+
- # Make relative paths absolute so we can write them in Config.cmake files
- foreach(p LIB INCLUDE DATA BIN)
-   set(var INSTALL_${p}_DIR)
-@@ -452,6 +460,11 @@ message(STATUS "Generating '${PROJECT_BI
- configure_file(${PROJECT_SOURCE_DIR}/cmake_aux/InstallFiles/ArmadilloConfigVersion.cmake.in
-   "${PROJECT_BINARY_DIR}/ArmadilloConfigVersion.cmake" @ONLY)
- 
-+if(ARMA_INSTALL_PKGCONFIG)
-+  message(STATUS "Generating '${PROJECT_BINARY_DIR}/misc/armadillo.pc'")
-+  configure_file(${PROJECT_SOURCE_DIR}/misc/armadillo.pc.in
-+    "${PROJECT_SOURCE_DIR}/misc/armadillo.pc" @ONLY)
-+endif()
- 
- # Install the export set for use with the install-tree
- install(EXPORT ArmadilloLibraryDepends DESTINATION
-@@ -481,3 +494,9 @@ install(FILES
-   "${PROJECT_BINARY_DIR}/InstallFiles/ArmadilloConfig.cmake"
-   "${PROJECT_BINARY_DIR}/InstallFiles/ArmadilloConfigVersion.cmake"
-   DESTINATION "${ARMADILLO_CMAKE_DIR}" COMPONENT dev)
-+
-+# Install pkgconfig file if wanted
-+if(ARMA_INSTALL_PKGCONFIG)
-+  install(FILES "${PROJECT_SOURCE_DIR}/misc/armadillo.pc"
-+          DESTINATION "${PKGCONFIG_DIR}")
-+endif()

armadillo.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec 19 08:54:52 UTC 2016 - badshah400@gmail.com
+
+- Update to version 7.600.1:
+  + More accurate eigs_sym() and eigs_gen().
+  + Expanded floor(), ceil(), round(), trunc(), sign() to handle
+    sparse matrices.
+  + Added arg(), atan2(), hypot().
+- Drop armadillo-install-pkgconfig.patch: resolved upstream.
+
 -------------------------------------------------------------------
 Mon Nov 21 00:38:17 UTC 2016 - badshah400@gmail.com
 

armadillo.spec

@@ -18,7 +18,7 @@
 
 %define soname libarmadillo7
 Name:           armadillo
-Version:        7.500.2
+Version:        7.600.1
 Release:        0
 Summary:        Fast C++ matrix library with interfaces to LAPACK and ATLAS
 License:        MPL-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-install-pkgconfig.patch badshah400@gmail.com -- Generate and install a pkgconfig file
-Patch0:         armadillo-install-pkgconfig.patch
 # 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
@@ -131,7 +129,6 @@ and user documentation (reference guide).
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 #Convert DOS end-of-line to UNIX end-of-line
 sed -i 's/\r//' README.txt