diff --git a/update-rm-command-description.patch b/update-rm-command-description.patch new file mode 100644 index 0000000000000000000000000000000000000000..bbee9a1788c535f920c229beb1a91e073f7d69b3 --- /dev/null +++ b/update-rm-command-description.patch @@ -0,0 +1,39 @@ +From 505f4671fce1f977bf1bd8993ad34ed4a2baf85e Mon Sep 17 00:00:00 2001 +From: shixuantong +Date: Tue, 27 May 2025 11:06:24 +0800 +Subject: [PATCH] update --rm command description + +--- + programs/zstdcli.c | 2 +- + tests/cli-tests/basic/help.sh.stdout.glob | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/programs/zstdcli.c b/programs/zstdcli.c +index 83d9b88..f8071fe 100644 +--- a/programs/zstdcli.c ++++ b/programs/zstdcli.c +@@ -146,7 +146,7 @@ static void usage(FILE* f, const char* programName) + DISPLAY_F(f, "Options:\n"); + DISPLAY_F(f, " -o OUTPUT Write output to a single file, OUTPUT.\n"); + DISPLAY_F(f, " -k, --keep Preserve INPUT file(s). [Default] \n"); +- DISPLAY_F(f, " --rm Remove INPUT file(s) after successful (de)compression.\n"); ++ DISPLAY_F(f, " --rm Remove INPUT file(s) after successful (de)compression when used with `-o` option.\n"); + #ifdef ZSTD_GZCOMPRESS + if (exeNameMatch(programName, ZSTD_GZ)) { /* behave like gzip */ + DISPLAY_F(f, " -n, --no-name Do not store original filename when compressing.\n\n"); +diff --git a/tests/cli-tests/basic/help.sh.stdout.glob b/tests/cli-tests/basic/help.sh.stdout.glob +index 21bc28c..e87268e 100644 +--- a/tests/cli-tests/basic/help.sh.stdout.glob ++++ b/tests/cli-tests/basic/help.sh.stdout.glob +@@ -6,7 +6,7 @@ Usage: zstd *OPTIONS...* *INPUT... | -* *-o OUTPUT* + Options: + -o OUTPUT Write output to a single file, OUTPUT. + -k, --keep Preserve INPUT file(s). *Default* +- --rm Remove INPUT file(s) after successful (de)compression. ++ --rm Remove INPUT file(s) after successful (de)compression when used with `-o` option. + + -# Desired compression level, where `#` is a number between 1 and 19; + lower numbers provide faster compression, higher numbers yield +-- +2.27.0 + diff --git a/zstd.spec b/zstd.spec index 4d755b6bf1f0c1a358ba91f965d8d71931d744f2..41c4d69c58928d32b7c32f78bef98fc8eab9a437 100644 --- a/zstd.spec +++ b/zstd.spec @@ -2,12 +2,14 @@ Name: zstd Version: 1.5.7 -Release: 1 +Release: 2 Summary: A fast lossless compression algorithm License: BSD-3-Clause AND GPL-2.0-only URL: https://github.com/facebook/zstd Source0: https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch9000: update-rm-command-description.patch + BuildRequires: gcc gcc-c++ BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) @@ -79,6 +81,9 @@ install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1 %{_mandir}/man1/*.1* %changelog +* Thu May 27 2025 shixuantong - 1.5.7-2 +- update --rm command description + * Thu Feb 20 2025 Funda Wang - 1.5.7-1 - Update to verion 1.5.7