From 29fdc195831af1e0eb80d695bd8e46310f90b013 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 1 Jul 2021 16:50:18 +0200 Subject: [PATCH] Drop gtest-devel dependency Resolves: rhbz#1977606 --- zstd.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/zstd.spec b/zstd.spec index 9354cc7..584cf2d 100644 --- a/zstd.spec +++ b/zstd.spec @@ -11,9 +11,12 @@ %endif %endif +# Disable gtest +%bcond_with gtest + Name: zstd Version: 1.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Zstd compression library License: BSD and GPLv2 @@ -23,7 +26,10 @@ Source0: https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{n Patch1: pzstd.1.patch BuildRequires: make -BuildRequires: gcc gtest-devel +BuildRequires: gcc +%if %{with gtest} +BuildRequires: gtest-devel +%endif %if %{with pzstd} BuildRequires: gcc-c++ %endif @@ -74,9 +80,11 @@ export CFLAGS="$RPM_OPT_FLAGS" export LDFLAGS="$RPM_LD_FLAGS" make -C tests test-zstd %if %{with pzstd} +%if %{with gtest} export CXXFLAGS="$RPM_OPT_FLAGS" make -C contrib/pzstd test %endif +%endif %install %make_install PREFIX=%{_prefix} LIBDIR=%{_libdir} @@ -121,6 +129,10 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1 %ldconfig_scriptlets -n lib%{name} %changelog +* Thu Jul 01 2021 Jakub Martisko - 1.4.9-3 +- Drop gtest-devel dependency +Resolves: rhbz#1977606 + * Fri Apr 16 2021 Mohan Boddu - 1.4.9-2 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937