diff --git a/.gitignore b/.gitignore index 25c0eca..478b83e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /blis-0.4.1.tar.gz +/blis-0.5.0.tar.gz diff --git a/blis-python.patch b/blis-python.patch deleted file mode 100644 index 881367b..0000000 --- a/blis-python.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- blis-0.3.2/build/flatten-headers.py~ 2018-04-28 20:07:31.000000000 +0100 -+++ blis-0.3.2/build/flatten-headers.py 2018-06-18 11:21:42.149168214 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # - # BLIS - # An object-based framework for developing high-performance BLAS-like diff --git a/blis.spec b/blis.spec index dd96fdd..07b41d5 100644 --- a/blis.spec +++ b/blis.spec @@ -23,8 +23,8 @@ %undefine _ld_as_needed Name: blis -Version: 0.4.1 -Release: 2%gitver%{?dist} +Version: 0.5.0 +Release: 1%gitver%{?dist} Summary: BLAS-like Library Instantiation Software Framework License: BSD URL: https://github.com/flame/blis @@ -33,8 +33,6 @@ Source0: https://github.com/flame/blis/archive/%commit/%name-%shortcommit.tar.gz %else Source0: https://github.com/flame/blis/archive/%version/%name-%version.tar.gz %endif -# Specify python3 -Patch1: blis-python.patch BuildRequires: perl BuildRequires: %{?dts6:devtoolset-6-binutils devtoolset-6-}gcc BuildRequires: /usr/bin/python3 gcc-gfortran chrpath @@ -130,7 +128,6 @@ BLIS architecture macros. %prep %setup -q %{?commit: -n %name-%commit} -%patch1 -p1 -b .python %build @@ -149,6 +146,7 @@ esac # Add back -O3, overridden by -O2 in RPM_OPT_FLAGS. %global confflags --enable-debug=opt --disable-static --enable-shared --enable-verbose-make --enable-cblas export CFLAGS="$RPM_OPT_FLAGS -O3" LDFLAGS="%{?__global_ldflags}" +export PYTHON=python3 # It's not an autotools configure ./configure --prefix=$(pwd)/o %confflags -t openmp $arch @@ -374,6 +372,10 @@ export LD_LIBRARY_PATH=`pwd`/serial/lib %{macrosdir}/macros.blis-srpm %changelog +* Thu Nov 8 2018 Dave Love - 0.5.0-1 +- New version +- Drop python3 patch + * Thu Oct 4 2018 Dave Love - 0.4.1-2 - Use LDFLAGS for BLAS shims - Add srpm-macros package diff --git a/sources b/sources index 4d0e9c7..e2564f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blis-0.4.1.tar.gz) = 433ab252893b1525695de1f8e3065771d879f30d69d9c0acc292407d824cc4cfac41b951ab28c36b8e4680a5569e9912ac088f3236eadea62038ec7a6ffcda53 +SHA512 (blis-0.5.0.tar.gz) = 4f514fb555d61151f5cc3e1dff7d24764059facfc9404aba58458348f7d7b1fa7db4fda31c82e36593a60ed6795ad018fcc27ab971e1e9fbc06da44c51ba0c38