diff --git a/squashfs.changes b/squashfs.changes index 3a6a16e..d52346e 100644 --- a/squashfs.changes +++ b/squashfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 14 12:33:23 UTC 2022 - Torsten Duwe + +- Do not repeat openSUSE / SLE version tests + +- Actually format and package the man pages + ------------------------------------------------------------------- Sun May 8 04:11:28 UTC 2022 - Cristian Rodríguez diff --git a/squashfs.spec b/squashfs.spec index 04815de..86b274c 100644 --- a/squashfs.spec +++ b/squashfs.spec @@ -26,15 +26,18 @@ URL: https://github.com/plougher/squashfs-tools Source0: https://github.com/plougher/squashfs-tools/archive/refs/tags/%{version}.tar.gz Patch0: squashfs-64k.patch Patch1: squashfs-thread-limit +BuildRequires: help2man BuildRequires: lzma-devel BuildRequires: lzo-devel BuildRequires: zlib-devel Supplements: filesystem(squashfs) %if %{?suse_version} > 1315 BuildRequires: liblz4-devel +%define _lz4_def LZ4_SUPPORT=1 %endif %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 BuildRequires: libzstd-devel +%define _zstd_def ZSTD_SUPPORT=1 %endif %description @@ -47,21 +50,18 @@ squashfs images. %build %define _lto_cflags %{nil} sed -i -e "s|-O2|%{optflags}|" squashfs-tools/Makefile -%make_build -C squashfs-tools LZMA_XZ_SUPPORT=1 XZ_SUPPORT=1 LZO_SUPPORT=1 \ -%if %{?suse_version} > 1315 - LZ4_SUPPORT=1 \ -%endif -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 - ZSTD_SUPPORT=1 -%endif +make %{?_smp_mflags} -C squashfs-tools \ + LZMA_XZ_SUPPORT=1 XZ_SUPPORT=1 LZO_SUPPORT=1 %{?_lz4_def} %{?_zstd_def} %install -mkdir -p %{buildroot}%{_bindir} -install -m 755 squashfs-tools/{un,mk}squashfs %{buildroot}%{_bindir} +make -C squashfs-tools install \ + INSTALL_PREFIX=%{buildroot}%{_prefix} \ + INSTALL_MANPAGES_DIR=%{buildroot}%{_mandir}/man1 %files %license COPYING %doc README-%{version} ACKNOWLEDGEMENTS CHANGES USAGE -%{_bindir}/*squashfs +%{_bindir}/* +%{_mandir}/man1/* %changelog