diff --git a/armadillo-7.700.0.tar.xz b/armadillo-7.700.0.tar.xz deleted file mode 100644 index b953226..0000000 --- a/armadillo-7.700.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9029490f7edfb7029e117961db6307c2c3ee368691ed15e4fc58d06c9115d94 -size 3999612 diff --git a/armadillo-7.800.0.tar.xz b/armadillo-7.800.0.tar.xz new file mode 100644 index 0000000..4a53c72 --- /dev/null +++ b/armadillo-7.800.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba56fb7b31c77d7ecd41334243d8a45d51e7559f76f6371783c17a72432dd486 +size 4000172 diff --git a/armadillo.changes b/armadillo.changes index fcfcd47..099fa53 100644 --- a/armadillo.changes +++ b/armadillo.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Feb 18 22:37:01 UTC 2017 - badshah400@gmail.com + +- Update to version 7.800.0: + + Changed license to the permissve Apache License 2.0. +- Update License tag in specfile in keeping with upstream. +- Update package file list: + + Include the license doc NOTICE.txt. + + Additional documentation file: armadillo_joss_2016.pdf. + ------------------------------------------------------------------- Wed Feb 8 13:58:57 UTC 2017 - badshah400@gmail.com diff --git a/armadillo.spec b/armadillo.spec index 916e853..d50c2de 100644 --- a/armadillo.spec +++ b/armadillo.spec @@ -18,10 +18,10 @@ %define soname libarmadillo7 Name: armadillo -Version: 7.700.0 +Version: 7.800.0 Release: 0 Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS -License: MPL-2.0 +License: Apache-2.0 Group: Development/Libraries/C and C++ Url: http://arma.sourceforge.net/ Source: http://downloads.sourceforge.net/arma/%{name}-%{version}.tar.xz @@ -133,6 +133,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 +sed -i 's/\r//' NOTICE.txt # 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 @@ -167,7 +168,8 @@ popd %defattr(-,root,root) %doc armadillo_nicta_2010.pdf %doc rcpp_armadillo_csda_2014.pdf -%doc LICENSE.txt README.txt index.html examples/ docs.html +%doc armadillo_joss_2016.pdf +%doc LICENSE.txt NOTICE.txt README.txt index.html examples/ docs.html %files devel %defattr(-,root,root)