From 6263ca78e42eb8d7073db2978f912234f76a310e Mon Sep 17 00:00:00 2001
From: Andrey Bondrov <andrey.bondrov@rosalab.ru>
Date: Thu, 21 Jun 2018 18:06:17 +1000
Subject: [PATCH] Spec cleanup, disable tests by default

---
 zstd.spec | 81 +++++++++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/zstd.spec b/zstd.spec
index 1c4b395..6980829 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -1,7 +1,7 @@
-%define realname        zstd
-%define libmajor        1
-%define libname         %mklibname %{realname} %{libmajor}
-%define libname_devel   %mklibname %{realname} -d
+%define oname zstd
+%define major 1
+%define libname %mklibname %{oname} %{major}
+%define devname %mklibname %{oname} -d
 
 # aarch64 and armv7hl at least currently segfault
 # in ThreadPool test for the pzstd util
@@ -9,21 +9,18 @@
 %bcond_without pzstd
 %endif
 
-Name:           zstd
-Version:        1.3.4
-Release:        1
-Summary:        Zstd compression library
+%bcond_with tests
+
+Summary:	Zstd compression library
+Name:		zstd
+Version:	1.3.4
+Release:	2
+License:	BSD and GPLv2+
 Group:		Archiving/Compression
-License:        BSD and GPLv2
-URL:            http://www.zstd.net/
-Source0:        https://github.com/facebook/zstd/archive/v%{version}/%{name}-%{version}.tar.gz
-
-Patch1:         pzstd.1.patch
-
-BuildRequires:  gcc gtest-devel
-%if %{with pzstd}
-BuildRequires:  gcc-c++
-%endif
+Url:		http://www.zstd.net/
+Source0:	https://github.com/facebook/zstd/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch1:		pzstd.1.patch
+BuildRequires:	gtest-devel
 
 %description
 Zstd, short for Zstandard, is a fast lossless compression algorithm,
@@ -46,27 +43,27 @@ targeting real-time compression scenarios at zlib-level compression ratio.
 #----------------------------------------------------------------------------
 
 %package -n %{libname}
-Summary:        Zstd shared library
+Summary:	Zstd shared library
 Group:		System/Libraries
+
 %description -n %{libname}
 Zstandard compression shared library.
 
 %files -n %{libname}
-%{_libdir}/libzstd.so.*
+%{_libdir}/libzstd.so.%{major}*
 
 #----------------------------------------------------------------------------
 
-%package -n %{libname_devel}
-Summary:        Header files for Zstd library
+%package -n %{devname}
+Summary:	Header files for Zstd library
 Group:		Development/C
-Requires:       %{libname} = %{EVRD}
-Provides:       %{name}-devel = %{EVRD}
-Provides:       lib%{name}-devel = %{EVRD}
+Requires:	%{libname} = %{EVRD}
+Provides:	%{name}-devel = %{EVRD}
 
-%description -n %{libname_devel}
+%description -n %{devname}
 Header files for Zstd library.
 
-%files -n %{libname_devel}
+%files -n %{devname}
 %{_includedir}/zbuff.h
 %{_includedir}/zdict.h
 %{_includedir}/zstd.h
@@ -84,29 +81,29 @@ find -name .gitignore -delete
 %endif
 
 %build
-%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;}
 for dir in lib programs; do
-  CFLAGS="%{optflags}" %make -C "$dir"
+  CFLAGS="%{optflags}" LDFLAGS="%{ldflags}" %make -C "$dir"
 done
 %if %{with pzstd}
-CFLAGS="%{optflags}" CXXFLAGS="%{optflags} -std=c++11" %make -C 'contrib/pzstd'
-%endif
-
-%check
-%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;}
-CFLAGS="%{optflags}" make -C tests test-zstd
-%if %{with pzstd}
-CFLAGS="%{optflags}" CXXFLAGS="%{optflags} -std=c++11" make -C contrib/pzstd test
+CFLAGS="%{optflags}" LDFLAGS="%{ldflags}" CXXFLAGS="%{optflags} -std=c++11" %make -C 'contrib/pzstd'
 %endif
 
 %install
 %make_install PREFIX=%{_prefix} LIBDIR=%{_libdir}
 # Remove undocumented wrappers of minimal use
-rm %{buildroot}/%{_bindir}/%{name}less
-rm %{buildroot}/%{_bindir}/%{name}grep
+rm %{buildroot}%{_bindir}/%{name}less
+rm %{buildroot}%{_bindir}/%{name}grep
 # Don't install the static lib
-rm %{buildroot}/%{_libdir}/libzstd.a
+rm %{buildroot}%{_libdir}/libzstd.a
 %if %{with pzstd}
-install -D -m755 contrib/pzstd/pzstd %{buildroot}/usr/bin/pzstd
-install -D -m644 programs/%{name}.1 %{buildroot}/%{_mandir}/man1/p%{name}.1
+install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd
+install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
+%endif
+
+%if %{with tests}
+%check
+CFLAGS="%{optflags}" LDFLAGS="%{ldflags}" make -C tests test-zstd
+%if %{with pzstd}
+CFLAGS="%{optflags}" LDFLAGS="%{ldflags}" CXXFLAGS="%{optflags} -std=c++11" make -C contrib/pzstd test
+%endif
 %endif