From 94b68dc747fb2d4d8cf288e0a5fb9227cb8397cfa06bef07dc99126ab9280e84 Mon Sep 17 00:00:00 2001
From: Bernhard Wiedemann <bwiedemann@suse.com>
Date: Fri, 14 Jun 2019 12:49:37 +0000
Subject: [PATCH] Accepting request 709960 from home:namtrac:branches:Archiving

- Remove googletest-devel BuildRequires and pzstd-global-gtest.patch
  because we want zstd in ring0 (due to rpm's zstd payload support)
  Since googletest is only used in build time (it's for testing after
  all), this should be fine.

OBS-URL: https://build.opensuse.org/request/show/709960
OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=33
---
 pzstd-global-gtest.patch | 33 ---------------------------------
 zstd.changes             |  8 ++++++++
 zstd.spec                |  3 ---
 3 files changed, 8 insertions(+), 36 deletions(-)
 delete mode 100644 pzstd-global-gtest.patch

diff --git a/pzstd-global-gtest.patch b/pzstd-global-gtest.patch
deleted file mode 100644
index 9a2df3d..0000000
--- a/pzstd-global-gtest.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -rupN zstd-1.3.4.orig/contrib/pzstd/Makefile zstd-1.3.4/contrib/pzstd/Makefile
---- zstd-1.3.4.orig/contrib/pzstd/Makefile	2018-03-27 00:19:34.000000000 +0200
-+++ zstd-1.3.4/contrib/pzstd/Makefile	2018-06-14 13:46:16.485820353 +0200
-@@ -32,7 +32,7 @@ LDFLAGS  ?=
- 
- # Include flags
- PZSTD_INC  = -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(PROGDIR) -I.
--GTEST_INC  = -isystem googletest/googletest/include
-+GTEST_INC  =
- 
- PZSTD_CPPFLAGS  = $(PZSTD_INC)
- PZSTD_CCXXFLAGS =
-@@ -46,7 +46,7 @@ ALL_LDFLAGS     = $(EXTRA_FLAGS) $(LDFLA
- 
- 
- # gtest libraries need to go before "-lpthread" because they depend on it.
--GTEST_LIB  = -L googletest/build/googlemock/gtest
-+GTEST_LIB  =
- LIBS       =
- 
- # Compilation commands
-@@ -212,10 +212,7 @@ GTEST_CMAKEFLAGS =
- .PHONY: googletest
- googletest: PZSTD_CCXXFLAGS += -fPIC
- googletest:
--	@$(RM) -rf googletest
--	@git clone https://github.com/google/googletest
--	@mkdir -p googletest/build
--	@cd googletest/build && cmake $(GTEST_CMAKEFLAGS) -DCMAKE_CXX_FLAGS="$(ALL_CXXFLAGS)" .. && $(MAKE)
-+	true
- 
- .PHONY: googletest32
- googletest32: PZSTD_CCXXFLAGS  += -m32
diff --git a/zstd.changes b/zstd.changes
index f685bae..847105c 100644
--- a/zstd.changes
+++ b/zstd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jun 14 11:52:32 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
+
+- Remove googletest-devel BuildRequires and pzstd-global-gtest.patch
+  because we want zstd in ring0 (due to rpm's zstd payload support)
+  Since googletest is only used in build time (it's for testing after
+  all), this should be fine.
+
 -------------------------------------------------------------------
 Sun Jun  2 10:11:25 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/zstd.spec b/zstd.spec
index 6afbf6e..56428ee 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -27,11 +27,9 @@ Group:          Productivity/Archiving/Compression
 URL:            https://github.com/facebook/zstd
 Source0:        https://github.com/facebook/zstd/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Patch1:         pzstd.1.patch
-Patch2:         pzstd-global-gtest.patch
 BuildRequires:  gcc
 # C++ is needed for pzstd only
 BuildRequires:  gcc-c++
-BuildRequires:  googletest-devel
 BuildRequires:  pkgconfig
 
 %description
@@ -85,7 +83,6 @@ Needed for compiling programs that link with the library.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects