diff --git a/openblas.spec b/openblas.spec index 17b6bdf..6418ec0 100644 --- a/openblas.spec +++ b/openblas.spec @@ -15,14 +15,12 @@ Name: openblas Version: 0.2.19 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An optimized BLAS library based on GotoBLAS2 Group: Development/Libraries License: BSD URL: https://github.com/xianyi/OpenBLAS/ Source0: https://github.com/xianyi/OpenBLAS/archive/v%{version}.tar.gz -# This contains the list of arches that openblas works on -Source1: openblas_arches # Use system lapack Patch0: openblas-0.2.15-system_lapack.patch # Drop extra p from threaded library name @@ -93,7 +91,6 @@ BuildRequires: lapack64-static # Upstream supports the package only on these architectures. # Runtime processor detection is not available on other archs. -%global openblas_arches %(cat %SOURCE1) ExclusiveArch: %{openblas_arches} %global base_description \ @@ -224,13 +221,6 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} This package contains the static libraries. -%package srpm-macros -Summary: RPM macros for building source packages -BuildArch: noarch - -%description srpm-macros -RPM macros for building source packages. - %prep %setup -q -c -T @@ -557,12 +547,6 @@ done # Get rid of generated CMake config rm -rf %{buildroot}%{_libdir}/cmake -# rpm macro -%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) -mkdir -p %{buildroot}%{macrosdir} -# Avoid expansion of macros inside %%openblas_arches by catting the source again -echo %%openblas_arches $(cat %SOURCE1) > %{buildroot}%{macrosdir}/macros.%{name}-srpm - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -648,9 +632,6 @@ rm -rf %{buildroot} %{_libdir}/lib%{name}p64_.so %endif -%files srpm-macros -%{macrosdir}/macros.%{name}-srpm - %files Rblas %{_libdir}/R/lib/libRblas.so @@ -668,6 +649,9 @@ rm -rf %{buildroot} %endif %changelog +* Mon Mar 20 2017 Orion Poplawski - 0.2.19-9 +- Move openblas-srpm-macros to separate package + * Wed Mar 15 2017 Orion Poplawski - 0.2.19-8 - Define %%openblas_arches for dependent packages to use diff --git a/openblas_arches b/openblas_arches deleted file mode 100644 index 82e1f3f..0000000 --- a/openblas_arches +++ /dev/null @@ -1 +0,0 @@ -x86_64 %{ix86} armv7hl %{power64} aarch64