From 552405e9eee0fa71a2bf6d20f9451a5c126b140ea7c9adc5959239562a7d4398 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 27 Apr 2022 09:39:29 +0000
Subject: [PATCH] Accepting request 973066 from home:dimstar:Factory

- Rename xz_lzma.patch xz_lzma_zstd.patch and expand the patch to
  supprt zstd compression (boo#1198922).

OBS-URL: https://build.opensuse.org/request/show/973066
OBS-URL: https://build.opensuse.org/package/show/Base:System/gzip?expand=0&rev=89
---
 gzip.changes                        | 6 ++++++
 gzip.spec                           | 2 +-
 xz_lzma.patch => xz_lzma_zstd.patch | 7 +++++--
 3 files changed, 12 insertions(+), 3 deletions(-)
 rename xz_lzma.patch => xz_lzma_zstd.patch (83%)

diff --git a/gzip.changes b/gzip.changes
index 338e4b0..7fa0194 100644
--- a/gzip.changes
+++ b/gzip.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 27 08:53:53 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Rename xz_lzma.patch xz_lzma_zstd.patch and expand the patch to
+  supprt zstd compression (boo#1198922).
+
 -------------------------------------------------------------------
 Sat Apr  9 11:45:49 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/gzip.spec b/gzip.spec
index ab00296..c4b93a1 100644
--- a/gzip.spec
+++ b/gzip.spec
@@ -32,7 +32,7 @@ Patch2:         zmore.diff
 Patch3:         non-exec-stack.diff
 Patch6:         zdiff.diff
 # PATCH FIX OPENSUSE BNC#799561 - zgrep silently fails on LZMA compressed files
-Patch7:         xz_lzma.patch
+Patch7:         xz_lzma_zstd.patch
 Patch8:         manpage-no-date.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
diff --git a/xz_lzma.patch b/xz_lzma_zstd.patch
similarity index 83%
rename from xz_lzma.patch
rename to xz_lzma_zstd.patch
index 5ffcff7..2ff8b61 100644
--- a/xz_lzma.patch
+++ b/xz_lzma_zstd.patch
@@ -7,7 +7,7 @@ Index: gzip-1.12/zgrep.1
  command invokes
  .B grep
 -on compressed or gzipped files.
-+on compressed, xz'ed, lzma'ed, bzip2'ed or gzipped files.
++on compressed, xz'ed, lzma'ed, zstd'ed, bzip2'ed or gzipped files.
  All options specified are passed directly to
  .BR grep .
  If no file is specified, then the standard input is decompressed
@@ -15,7 +15,7 @@ Index: gzip-1.12/zgrep.in
 ===================================================================
 --- gzip-1.12.orig/zgrep.in
 +++ gzip-1.12/zgrep.in
-@@ -215,6 +215,12 @@ do
+@@ -215,6 +215,15 @@ do
      *.bz2)
        uncompress=bzip2
        ;;
@@ -24,6 +24,9 @@ Index: gzip-1.12/zgrep.in
 +      ;;
 +    *.lzma)
 +      uncompress=lzma
++      ;;
++    *.zst)
++      uncompress=zstd
 +      ;;
      *)
        uncompress=gzip