diff --git a/.gitignore b/.gitignore index 14059f9..d4e9682 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ squashfs-4.1.tar.bz2 /squashfs-tools-d5a583e4edce3df9f0c3bca84bff4f1d5ad3d09c.tar.gz /squashfs-tools-11c9591260599b7874841db6f69ae570708a4077.tar.gz /squashfs-tools-8a9d02e0027c69e6f47d8c2ed995d8c755c9581b.tar.gz +/squashfs-tools-d61eb68d75b32977b6c5a8b2d2fe57cbef0d6b4a.tar.gz +/squashfs-tools-7f9203e31bae003d12c0fc81a4b32097d17b5618.tar.gz diff --git a/sources b/sources index 305605c..c13d613 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (squashfs-tools-8a9d02e0027c69e6f47d8c2ed995d8c755c9581b.tar.gz) = cd27550dab667de1bc629eed90434d8a0e67ee904d1a21ee5308ddadeddf1e8342d29f3434648564c64418e69430884797dbfcc57210b129cb8b3be9bb1a1d57 +SHA512 (squashfs-tools-7f9203e31bae003d12c0fc81a4b32097d17b5618.tar.gz) = bcf9215d218c2d15a3b2b6b50c6771917694ae8877f767d93af0af342f13ab935db097dff2fa7ff151c6aff71e9be01dcbb1636443ef64b29b7d872a2668e629 SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 6108de1..f17e3c9 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,12 +2,12 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220204 -%global commit 8a9d02e0027c69e6f47d8c2ed995d8c755c9581b +%global date 20220207 +%global commit 7f9203e31bae003d12c0fc81a4b32097d17b5618 %forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz # Phillip is working on providing man pages very soon. Which will replace these. @@ -22,6 +22,7 @@ BuildRequires: lzo-devel BuildRequires: libattr-devel BuildRequires: lz4-devel BuildRequires: libzstd-devel +BuildRequires: help2man %description Squashfs is a highly compressed read-only filesystem for Linux. This package @@ -36,13 +37,9 @@ pushd squashfs-tools CFLAGS="%{optflags}" XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1 make %{?_smp_mflags} %install -mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_mandir}/man1 -install -m 755 squashfs-tools/mksquashfs %{buildroot}%{_sbindir}/mksquashfs -install -m 755 squashfs-tools/unsquashfs %{buildroot}%{_sbindir}/unsquashfs -install -m 644 manpages/mksquashfs.1 %{buildroot}%{_mandir}/man1/mksquashfs.1 +pushd squashfs-tools +make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL_MANPAGES_DIR=%{buildroot}%{_mandir}/man1 install install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 -ln -s mksquashfs %{buildroot}%{_sbindir}/sqfstar -ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %files %doc README ACKNOWLEDGEMENTS README-4.5 CHANGES COPYING USAGE @@ -57,6 +54,10 @@ ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %{_sbindir}/sqfscat %changelog +* Mon Feb 07 2022 Bruno Wolff III - 4.5-8.20220207git7f9203e +- Continue testing upstream patches +- Man pages are now built during the build process + * Fri Feb 04 2022 Bruno Wolff III - 4.5-7.20220204git8a9d02e - Continue testing upstream patches - A makefile for mksquashfs is now included