on %{arm} prefer memory access compatibility over performance

[packages/zstd.git] / zstd.spec

diff --git a/zstd.spec b/zstd.spec
index 5c337240b0eace404759f676aaf433c653231b64..6ebe717804903aac90891c2b4cf7cb42b9d5fb7f 100644 (file)
--- a/zstd.spec
+++ b/zstd.spec
@@ -1,18 +1,21 @@
 Summary:       Zstandard - fast lossless compression algorithm
 Summary(pl.UTF-8):     Zstandard - szybki, bezstratny algorytm kompresji
 Name:          zstd
-Version:       1.3.5
+Version:       1.4.8
 Release:       1
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/facebook/zstd/releases
 Source0:       https://github.com/facebook/zstd/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: d2fc97be4852d666f086282053c02319
-Patch0:                %{name}-noquiet.patch
+# Source0-md5: 6714b17a74cdb38d13b7664f38aaf264
 URL:           https://github.com/facebook/zstd
 BuildRequires: gcc >= 5:3.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%ifarch %{arm}
+%define                archcflags      -DMEM_FORCE_MEMORY_ACCESS=1
+%endif
+
 %description
 Zstd, short for Zstandard, is a fast lossless compression algorithm,
 targeting real-time compression scenarios at zlib-level compression
@@ -49,22 +52,29 @@ Statyczna biblioteka Zstd.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 CC="%{__cc}" \
-CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+CXX="%{__cxx}" \
+CFLAGS="%{rpmcflags} %{rpmcppflags} %{?archcflags}" \
+CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}" \
 LDFLAGS="%{rpmldflags}" \
-%{__make} -j1 all
+%{__make} allmost manual \
+       V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/%{_lib}
 
 %{__make} install \
+       V=1 \
        DESTDIR=$RPM_BUILD_ROOT \
        PREFIX=%{_prefix} \
        LIBDIR=%{_libdir}
 
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libzstd.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libzstd.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libzstd.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -73,24 +83,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE NEWS README.md
+%doc LICENSE CHANGELOG README.md
 %attr(755,root,root) %{_bindir}/unzstd
 %attr(755,root,root) %{_bindir}/zstd
 %attr(755,root,root) %{_bindir}/zstdcat
 %attr(755,root,root) %{_bindir}/zstdgrep
 %attr(755,root,root) %{_bindir}/zstdless
 %attr(755,root,root) %{_bindir}/zstdmt
-%attr(755,root,root) %{_libdir}/libzstd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libzstd.so.1
+%attr(755,root,root) /%{_lib}/libzstd.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libzstd.so.1
 %{_mandir}/man1/unzstd.1*
 %{_mandir}/man1/zstd.1*
 %{_mandir}/man1/zstdcat.1*
+%{_mandir}/man1/zstdgrep.1*
+%{_mandir}/man1/zstdless.1*
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/{zstd_compression_format.md,zstd_manual.html,images}
 %attr(755,root,root) %{_libdir}/libzstd.so
-%{_includedir}/zbuff.h
 %{_includedir}/zdict.h
 %{_includedir}/zstd.h
 %{_includedir}/zstd_errors.h