diff --git a/.files b/.files
index f436cbf..9d6f602 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 4a61311..93f3bab 100644
--- a/.rev
+++ b/.rev
@@ -71,4 +71,12 @@
1099232
+
+ fa1a825d9d8b16e42e9565e2e9356419
+ 23.01
+
+ dimstar_suse
+
+ 1137010
+
diff --git a/7zip.changes b/7zip.changes
index f704779..33f6afe 100644
--- a/7zip.changes
+++ b/7zip.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jan 2 20:37:25 UTC 2024 - Martin Schreiner
+
+- Add missing man pages for 7z / 7za / 7zr / 7zz.
+ This solves bsc#1204856.
+
+-------------------------------------------------------------------
Tue Jul 18 02:01:41 UTC 2023 - Linnaea Lavia
- Enable ARM64 ASM introduced in 23.01
diff --git a/7zip.spec b/7zip.spec
index f5f4bf0..d1ad185 100644
--- a/7zip.spec
+++ b/7zip.spec
@@ -1,7 +1,7 @@
#
# spec file for package 7zip
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Name: 7zip
Version: 23.01
Release: 0
-Summary: File Archivier
+Summary: Command-line file archiver with high compression ratio
# CPP/7zip/Compress/LzfseDecoder.cpp is under the BSD-3-Clause
# C/Sha1.c and C/Sha256.c are in the public domain
License: BSD-3-Clause AND LGPL-2.1-or-later AND SUSE-Public-Domain
@@ -29,6 +29,7 @@ URL: https://www.7-zip.org/
Source: https://www.7-zip.org/a/7z%{stripped_version}-src.tar.xz
Source1: p7zip
Source2: p7zip.1
+Source3: 7zz.1
Patch0: fix-compatib-with-p7zip.patch
BuildRequires: dos2unix
BuildRequires: gcc
@@ -97,16 +98,25 @@ install -Dm 755 CPP/7zip/Bundles/Alone2/b/g/7zz %{buildroot}%{_bindir}/7zz
%endif
%endif
%endif
-# Create links the executables provided by p7zip
+
+# Create links for the executables provided by p7zip
ln -s %{_bindir}/7zz %{buildroot}%{_bindir}/7z
ln -s %{_bindir}/7z %{buildroot}%{_bindir}/7za
ln -s %{_bindir}/7z %{buildroot}%{_bindir}/7zr
+
# Install p7zip wrapper and its manpage
install -m755 %{SOURCE1} %{buildroot}%{_bindir}/p7zip
install -m644 -Dt %{buildroot}%{_mandir}/man1 %{SOURCE2}
# Remove a mention of the p7zip-rar package that we don't have
sed -i 's/RAR (if the non-free p7zip-rar package is installed)//g' %{buildroot}%{_mandir}/man1/p7zip.1
+# Install manpage for 7zz, and link 7z / 7za / 7zr accordingly
+# This mimics the link structure used for the actual executables
+install -m644 -Dt %{buildroot}%{_mandir}/man1 %{SOURCE3}
+ln -s %{_mandir}/man1/7zz.1 %{buildroot}%{_mandir}/man1/7z.1
+ln -s %{_mandir}/man1/7z.1 %{buildroot}%{_mandir}/man1/7za.1
+ln -s %{_mandir}/man1/7z.1 %{buildroot}%{_mandir}/man1/7zr.1
+
%files
%license DOC/copying.txt DOC/License.txt
%doc DOC/readme.txt DOC/7zC.txt DOC/Methods.txt DOC/src-history.txt
@@ -116,5 +126,9 @@ sed -i 's/RAR (if the non-free p7zip-rar package is installed)//g' %{buildroot}%
%{_bindir}/7zz
%{_bindir}/p7zip
%{_mandir}/man1/p7zip.1%{?ext_man}
+%{_mandir}/man1/7z.1%{?ext_man}
+%{_mandir}/man1/7za.1%{?ext_man}
+%{_mandir}/man1/7zr.1%{?ext_man}
+%{_mandir}/man1/7zz.1%{?ext_man}
%changelog
diff --git a/7zz.1 b/7zz.1
new file mode 100644
index 0000000..ba74c1b
--- /dev/null
+++ b/7zz.1
@@ -0,0 +1,237 @@
+.\"
+.TH 7z "1" "May 2023" "22.01"
+.SH NAME
+7z \- 7-Zip file archiver with a high compression ratio
+.SH SYNOPSIS
+.SY 7z
+\fI\,command\/\fR
+[\fI\,switches\/\fR\&.\|.\|.\&]
+\fI\,archive_name\/\fR
+[\fI\,file_names\/\fR]
+[@\fI\,listfile\/\fR]
+.YS
+.SY 7zz
+\fI\,command\/\fR
+[\fI\,switches\/\fR\&.\|.\|.\&]
+\fI\,archive_name\/\fR
+[\fI\,file_names\/\fR]
+[@\fI\,listfile\/\fR]
+.YS
+.SY 7za
+\fI\,command\/\fR
+[\fI\,switches\/\fR\&.\|.\|.\&]
+\fI\,archive_name\/\fR
+[\fI\,file_names\/\fR]
+[@\fI\,listfile\/\fR]
+.YS
+.SY 7zr
+\fI\,command\/\fR
+[\fI\,switches\/\fR\&.\|.\|.\&]
+\fI\,archive_name\/\fR
+[\fI\,file_names\/\fR]
+[@\fI\,listfile\/\fR]
+.YS
+.SH DESCRIPTION
+7-Zip file archiver with a high compression ratio
+.br
+There are some variants for 7z executable.
+.TP
+7z
+Full featured with plugin support
+.TP
+7zz
+Full featured single binary executable with no plugins support
+.TP
+7za
+Supports major formats only, no plugins, but smaller excutable size
+.TP
+7zr
+Only supports LZMA codec and related formats (7z, lzma, xz),
+no plugins, but smallest executable size
+.SH OPTIONS
+.SS Commands
+.TP
+a
+Add files to archive
+.TP
+b
+Benchmark
+.TP
+d
+Delete files from archive
+.TP
+e
+Extract files from archive (without using directory names)
+.TP
+h
+Calculate hash values for files
+.TP
+i
+Show information about supported formats
+.TP
+l
+List contents of archive
+.TP
+rn
+Rename files in archive
+.TP
+t
+Test integrity of archive
+.TP
+u
+Update files to archive
+.TP
+x
+eXtract files with full paths
+.SS Switches
+.TP
+\-\-
+Stop switches and @\fI\,listfile\/\fR parsing
+.TP
+\-ai[r[\-|0]]{@\fI\,listfile\/\fR|!\fI\,wildcard\/\fR}
+Include archives
+.TP
+\-ax[r[\-|0]]{@\fI\,listfile\/\fR|!\fI\,wildcard\/\fR}
+eXclude archives
+.TP
+\-ao{a|s|t|u}
+set Overwrite mode
+.TP
+\-an
+disable archive_name field
+.TP
+\-bb[0\-3]
+set output log level
+.TP
+\-bd
+disable progress indicator
+.TP
+\-bs{o|e|p}{0|1|2}
+set output stream for output/error/progress line
+.TP
+\-bt
+show execution time statistics
+.TP
+\-i[r[\-|0]]{@\fI\,listfile\/\fR|!\fI\,wildcard\/\fR}
+Include filenames
+.TP
+\-m{\fI\,Parameters\/\fR}
+set compression Method
+.RS
+.TQ
+\-mmt[\fI\,N\/\fR]
+set number of CPU threads
+.TQ
+\-mx[\fI\,N\/\fR]
+set compression level: \-mx1 (fastest) ... \-mx9 (ultra)
+.RE
+.TP
+\-o{\fI\,Directory\/\fR}
+set Output directory
+.TP
+\-p{\fI\,Password\/\fR}
+set Password
+.TP
+\-r[\-|0]
+Recurse subdirectories for name search
+.TP
+\-sa{a|e|s}
+set Archive name mode
+.TP
+\-scc{UTF\-8|WIN|DOS}
+set charset for for console input/output
+.TP
+\-scs{UTF\-8|UTF\-16LE|UTF\-16BE|WIN|DOS|{\fI\,id\/\fR}}
+set charset for list files
+.TP
+\-scrc[CRC32|CRC64|SHA1|SHA256|*]
+set hash function for \fBx\fR, \fBe\fR, \fBh\fR commands
+.TP
+\-sdel
+delete files after compression
+.TP
+\-seml[.]
+send archive by email
+.TP
+\-sfx[{\fI\,name\/\fR}]
+Create SFX archive
+.TP
+\-si[{\fI\,name\/\fR}]
+read data from stdin
+.TP
+\-slp
+set Large Pages mode
+.TP
+\-slt
+show technical information for \fBl\fR (List) command
+.TP
+\-snh
+store hard links as links
+.TP
+\-snl
+store symbolic links as links
+.TP
+\-sni
+store NT security information
+.TP
+\-sns[\-]
+store NTFS alternate streams
+.TP
+\-so
+write data to stdout
+.TP
+\-spd
+disable wildcard matching for file names
+.TP
+\-spe
+eliminate duplication of root folder for extract command
+.TP
+\-spf
+use fully qualified file paths
+.TP
+\-ssc[\-]
+set sensitive case mode
+.TP
+\-sse
+stop archive creating, if it can't open some input file
+.TP
+\-ssp
+do not change Last Access Time of source files while archiving
+.TP
+\-ssw
+compress shared files
+.TP
+\-stl
+set archive timestamp from the most recently modified file
+.TP
+\-stm{\fI\,HexMask\/\fR}
+set CPU thread affinity mask (hexadecimal number)
+.TP
+\-stx{\fI\,Type\/\fR}
+exclude archive type
+.TP
+\-t{\fI\,Type\/\fR}
+Set type of archive
+.TP
+\-u[\-][p\fI\,#\/\fR][q\fI\,#\/\fR][r\fI\,#\/\fR][x\fI\,#\/\fR][y\fI\,#\/\fR][z\fI\,#\/\fR][!\fI\,newArchiveName\/\fR]
+Update options
+.TP
+\-v{\fI\,Size\/\fR}[b|k|m|g]
+Create volumes
+.TP
+\-w[{\fI\,path\/\fR}]
+assign Work directory. Empty path means a temporary directory
+.TP
+\-x[r[\-|0]]{@\fI\,listfile\/\fR|!\fI\,wildcard\/\fR}
+eXclude filenames
+.TP
+\-y
+assume Yes on all queries
+.SH SEE ALSO
+7-Zip
+.UR https://\:www.7-zip.org/
+.UE
+.SH COPYRIGHT
+Copyright \(co 1999\-2023 Igor Pavlov.
+.br
+Distributed under the LGPL-2.1+ license.