From c78b2a0a12fb98fbc7fb215e470644fc084f5a39 Mon Sep 17 00:00:00 2001 From: lizhao2025 Date: Wed, 17 Dec 2025 00:41:38 +0800 Subject: [PATCH] Update code from upstream --- zip-3.0-man-strip-extra.patch | 11 +++++++++++ zip.spec | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 zip-3.0-man-strip-extra.patch diff --git a/zip-3.0-man-strip-extra.patch b/zip-3.0-man-strip-extra.patch new file mode 100644 index 0000000..abb9f7c --- /dev/null +++ b/zip-3.0-man-strip-extra.patch @@ -0,0 +1,11 @@ +--- ./man/zip.1.old 2024-12-11 10:51:22.837845520 +0100 ++++ ./man/zip.1 2024-12-11 10:51:34.458142392 +0100 +@@ -2297,7 +2297,7 @@ + .B \-X + .TP + .PD +-.B \-\-no\-extra ++.B \-\-strip\-extra + Do not save extra file attributes (Extended Attributes on OS/2, uid/gid + and file times on Unix). The zip format uses extra fields to include + additional information for each entry. Some extra fields are specific diff --git a/zip.spec b/zip.spec index 1f4a056..48f8ad9 100644 --- a/zip.spec +++ b/zip.spec @@ -8,6 +8,7 @@ Source: http://downloads.sourceforge.net/infozip/%{name}30.tar.gz#/%{name}-%{v Summary: A file compression and packaging utility compatible with PKZIP Patch1: 0001-zip-3.0-format-security.patch +Patch2: zip-3.0-man-strip-extra.patch BuildRequires: make BuildRequires: bzip2-devel, gcc @@ -31,6 +32,7 @@ BuildArch: noarch The %{name}-doc package contains documentation files for %{name}. %prep +| %setup -q -n zip30 %patch1 -p1 -b .format-security @@ -67,6 +69,9 @@ mkdir -p $RPM_BULD_ROOT%{_mandir}/man1 %doc README CHANGES TODO WHATSNEW WHERE README.CR %changelog +* Tue Jul 01 2025 Jakub Martisko - 3.0-25 +- Fix wrongly named option in the manpage + * Thu Dec 22 2022 Funda Wang - 3.0-24 - Bump release for upgrading from anolis 8 -- Gitee