From 237c918961f5b6b9843d68d4103e5ca26c930748 Mon Sep 17 00:00:00 2001 From: shixuantong Date: Fri, 23 May 2025 17:36:42 +0800 Subject: [PATCH] update --rm command description (cherry picked from commit 5ed39ee9aeed1ae9cfd0c791060848216e26249e) --- update-rm-command-description.patch | 39 +++++++++++++++++++++++++++++ zstd.spec | 7 +++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 update-rm-command-description.patch diff --git a/update-rm-command-description.patch b/update-rm-command-description.patch new file mode 100644 index 0000000..e436074 --- /dev/null +++ b/update-rm-command-description.patch @@ -0,0 +1,39 @@ +From a91b785eca11e0b0bfca78318d42ad1ca38b3c38 Mon Sep 17 00:00:00 2001 +From: shixuantong +Date: Tue, 27 May 2025 10:59:21 +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 d246545..26cc127 100644 +--- a/programs/zstdcli.c ++++ b/programs/zstdcli.c +@@ -148,7 +148,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 76db7b9..9725164 100644 --- a/zstd.spec +++ b/zstd.spec @@ -2,12 +2,14 @@ Name: zstd Version: 1.5.5 -Release: 2 +Release: 3 Summary: A fast lossless compression algorithm License: BSD and GPLv2 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: gtest-devel gcc-c++ pkg-config Provides: libzstd @@ -85,6 +87,9 @@ install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1 %{_mandir}/man1/*.1* %changelog +* Tue May 27 2025 shixuantong - 1.5.5-3 +- update --rm command description + * Mon Dec 2 2024 zhangzikang - 1.5.5-2 * The libzsta.a library should be packaged to access advanced experimental features -- Gitee