From e9b032a3cc43cfe4f255d8021259779287171452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Thu, 17 Dec 2020 15:42:17 +0000
Subject: [PATCH] latest upstream (1.4.7)

---
 .gitignore     |  1 +
 lib-make.patch | 20 --------------------
 pzstd.1.patch  |  8 ++++----
 sources        |  2 +-
 zstd.spec      | 10 +++++-----
 5 files changed, 11 insertions(+), 30 deletions(-)
 delete mode 100644 lib-make.patch

diff --git a/.gitignore b/.gitignore
index a3f7f64..29fccf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /zstd-1.4.2.tar.gz
 /zstd-1.4.4.tar.gz
 /zstd-1.4.5.tar.gz
+/zstd-1.4.7.tar.gz
diff --git a/lib-make.patch b/lib-make.patch
deleted file mode 100644
index 2bbe9cf..0000000
--- a/lib-make.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur zstd-1.4.5.orig/lib/Makefile zstd-1.4.5/lib/Makefile
---- zstd-1.4.5.orig/lib/Makefile	2020-05-22 05:04:00.000000000 +0000
-+++ zstd-1.4.5/lib/Makefile	2020-05-25 14:11:28.947300726 +0000
-@@ -220,13 +220,14 @@
- .PHONY: lib
- lib : libzstd.a libzstd
- 
--.PHONY: lib-mt
-+# note : do not define lib-mt or lib-release as .PHONY
-+# make does not consider implicit pattern rule for .PHONY target
-+
- %-mt : CPPFLAGS += -DZSTD_MULTITHREAD
- %-mt : LDFLAGS  += -pthread
- %-mt : %
- 	@echo multi-threading build completed
- 
--.PHONY: lib-release
- %-release : DEBUGFLAGS :=
- %-release : %
- 	@echo release build completed
diff --git a/pzstd.1.patch b/pzstd.1.patch
index d6d0ee7..f86e8d8 100644
--- a/pzstd.1.patch
+++ b/pzstd.1.patch
@@ -1,7 +1,7 @@
-diff -Naur zstd-1.4.5.orig/programs/zstd.1 zstd-1.4.5/programs/zstd.1
---- zstd-1.4.5.orig/programs/zstd.1	2020-05-22 05:04:00.000000000 +0000
-+++ zstd-1.4.5/programs/zstd.1	2020-05-22 13:01:37.443798417 +0000
-@@ -202,6 +202,14 @@
+diff -Naur zstd-1.4.7.orig/programs/zstd.1 zstd-1.4.7/programs/zstd.1
+--- zstd-1.4.7.orig/programs/zstd.1	2020-12-16 23:00:18.000000000 +0000
++++ zstd-1.4.7/programs/zstd.1	2020-12-17 15:15:22.586152398 +0000
+@@ -208,6 +208,14 @@
  .
  .IP "\(bu" 4
  \fB\-\-\fR: All arguments after \fB\-\-\fR are treated as files
diff --git a/sources b/sources
index 0271367..111ae64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zstd-1.4.5.tar.gz) = 417b813ade6c8436690bd9d6da34a9f87f50e7378752b72e63066befbee496392a4b72896fa56688d814f461871ab31d3c6637497ff2ed7a282d58513631a38b
+SHA512 (zstd-1.4.7.tar.gz) = 43b2292e6518123bebfe0623ec8d7f832850ad1f4fd5b845328665330dd104574a27debd5530c204bf44d0d36737b3e57e07097e5ac6e8bb3bae4e9eeb0f2e0c
diff --git a/zstd.spec b/zstd.spec
index ecd6b4a..68c8f93 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -12,8 +12,8 @@
 %endif
 
 Name:           zstd
-Version:        1.4.5
-Release:        6%{?dist}
+Version:        1.4.7
+Release:        1%{?dist}
 Summary:        Zstd compression library
 
 License:        BSD and GPLv2
@@ -21,7 +21,6 @@ URL:            https://github.com/facebook/zstd
 Source0:        https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 Patch1:         pzstd.1.patch
-Patch2:         lib-make.patch
 
 BuildRequires:  gcc gtest-devel
 %if %{with pzstd}
@@ -58,7 +57,6 @@ find -name .gitignore -delete
 %if %{with pzstd}
 %patch1 -p1
 %endif
-%patch2 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -110,7 +108,6 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
 %license COPYING LICENSE
 
 %files -n lib%{name}-devel
-%{_includedir}/zbuff.h
 %{_includedir}/zdict.h
 %{_includedir}/zstd.h
 %{_includedir}/zstd_errors.h
@@ -123,6 +120,9 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
 %ldconfig_scriptlets -n lib%{name}
 
 %changelog
+* Thu Dec 17 2020 Pádraig Brady <P@draigBrady.com> - 1.4.7-1
+- Latest upstream
+
 * Wed Aug 26 2020 Jeff Law <law@redhat.com> - 1.4.5-6
 - Do not force C++11 mode