Add 02_man.patch from Debian

i9fe
Sérgio M. Basto 9 years ago
parent 2351137ae6
commit 0a1f339d0d

@ -0,0 +1,29 @@
Index: p7zip-9.20.1~dfsg.1/man1/7z.1
===================================================================
--- p7zip-9.20.1~dfsg.1.orig/man1/7z.1 2011-08-03 12:39:44.000000000 +0200
+++ p7zip-9.20.1~dfsg.1/man1/7z.1 2011-08-03 12:39:51.000000000 +0200
@@ -10,7 +10,7 @@
.BR <ARGUMENTS>...
.PP
.SH DESCRIPTION
-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format.
+7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (it was removed due to a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format.
.TP
7z uses plugins to handle archives.
.PP
Index: p7zip-9.20.1~dfsg.1/man1/7za.1
===================================================================
--- p7zip-9.20.1~dfsg.1.orig/man1/7za.1 2011-08-03 12:39:45.000000000 +0200
+++ p7zip-9.20.1~dfsg.1/man1/7za.1 2011-08-03 12:40:25.000000000 +0200
@@ -10,9 +10,9 @@
.BR <ARGUMENTS>...
.PP
.SH DESCRIPTION
-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format.
+7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (it was removed due to a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format.
.TP
-7za is a stand-alone executable. 7za handles less archive formats than 7z, but does not need any others.
+7za is a stand-alone executable. 7za handles less archive formats than 7z.
.PP
.SH FUNCTION LETTERS
.TP

@ -1,7 +1,7 @@
Summary: Very high compression ratio file archiver
Name: p7zip
Version: 15.09
Release: 8%{?dist}
Release: 9%{?dist}
# Files under C/Compress/Lzma/ are dual LGPL or CPL
License: LGPLv2 and (LGPLv2+ or CPL)
Group: Applications/Archiving
@ -20,6 +20,8 @@ Patch1: p7zip_15.09-s390.patch
Patch2: p7zip-15.09-CVE-2015-1038.patch
Patch3: p7zip_15.09-no7zG_and_7zFM.patch
Patch4: p7zip_15.09-incorrect-fsf-address.patch
# from Debain
Patch5: 02_man.patch
BuildRequires: cmake
# BuildRequires: wxGTK3-devel wxGTK-devel # for 7zG GUI
@ -53,6 +55,7 @@ rm DOC/License.txt.*
%patch2 -p1 -b .CVE-2015-1038
%patch3 -p1 -b .no7zG_and_7zFM.patch
%patch4 -p1
%patch5 -p1 -b .man
# Move docs early so that they don't get installed by "make install" and we
# can include them in %%doc
mv DOC docs
@ -93,6 +96,11 @@ make install \
DEST_BIN=%{_bindir} \
DEST_SHARE=%{_libexecdir}/p7zip \
DEST_MAN=%{_mandir}
find %{buildroot}
%check
find %{buildroot}
%files
@ -117,6 +125,9 @@ make install \
%changelog
* Mon Jan 25 2016 Sérgio Basto <sergio@serjux.com> - 15.09-9
- Add 02_man.patch from Debian
* Fri Jan 22 2016 Sérgio Basto <sergio@serjux.com> - 15.09-8
- Revert better solutions for "create unowned directory"

Loading…
Cancel
Save