diff --git a/.gitignore b/.gitignore index d464637..14059f9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ squashfs-4.1.tar.bz2 /squashfs-tools-5ae7238a0ae6fc420f55227d052ce9b1c66a9d0f.tar.gz /squashfs-tools-d5a583e4edce3df9f0c3bca84bff4f1d5ad3d09c.tar.gz /squashfs-tools-11c9591260599b7874841db6f69ae570708a4077.tar.gz +/squashfs-tools-8a9d02e0027c69e6f47d8c2ed995d8c755c9581b.tar.gz diff --git a/sources b/sources index c75e841..305605c 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (squashfs-tools-11c9591260599b7874841db6f69ae570708a4077.tar.gz) = ffad623926c30b84d0f175b03752783a01e786926dd13be85a53cf993450e1151626e720daf4dcd764ddad177f075d5e3e229e393eaa8be3f21bd4084d27512b -SHA512 (mksquashfs.1) = 4dc03bccf5842791abf6ca437ada03c331942a9a37fcacdbf136443db11a7f26121f6e8ba742aaffc9fda9a5e220b171c5223ee3ab0474dde6b300a63ee32f92 +SHA512 (squashfs-tools-8a9d02e0027c69e6f47d8c2ed995d8c755c9581b.tar.gz) = cd27550dab667de1bc629eed90434d8a0e67ee904d1a21ee5308ddadeddf1e8342d29f3434648564c64418e69430884797dbfcc57210b129cb8b3be9bb1a1d57 SHA512 (unsquashfs.1) = fbf7c96454584fb844572a43af8781688186e3854c0d0acb9dfd83c5d0e3b6f49b58fbd68407b66ff573f82d8d16ecd10a4c319e49e809428fe65068f0c48bf2 diff --git a/squashfs-tools.spec b/squashfs-tools.spec index e8fb3ab..6108de1 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,18 +2,16 @@ Name: squashfs-tools Version: 4.5 Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/%{name} -%global date 20220202 -%global commit 11c9591260599b7874841db6f69ae570708a4077 -%forgemeta -i -v +%global date 20220204 +%global commit 8a9d02e0027c69e6f47d8c2ed995d8c755c9581b +%forgemeta URL: %{forgeurl} Source: %{forgesource} -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ # manpages from http://ftp.debian.org/debian/pool/main/s/squashfs-tools/squashfs-tools_4.2+20121212-1.debian.tar.xz -# The man pages have been modified for 4.3 for Fedora. -# Man pages still need a lot of changes for 4.5 # Phillip is working on providing man pages very soon. Which will replace these. -Source1: mksquashfs.1 +# So far he has one for mksquashfs. Source2: unsquashfs.1 BuildRequires: make @@ -41,7 +39,7 @@ CFLAGS="%{optflags}" XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 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 %{SOURCE1} %{buildroot}%{_mandir}/man1/mksquashfs.1 +install -m 644 manpages/mksquashfs.1 %{buildroot}%{_mandir}/man1/mksquashfs.1 install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 ln -s mksquashfs %{buildroot}%{_sbindir}/sqfstar ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat @@ -50,7 +48,8 @@ ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %doc README ACKNOWLEDGEMENTS README-4.5 CHANGES COPYING USAGE %doc README -%{_mandir}/man1/* +%{_mandir}/man1/mksquashfs.1.gz +%{_mandir}/man1/unsquashfs.1.gz %{_sbindir}/mksquashfs %{_sbindir}/unsquashfs @@ -58,8 +57,12 @@ ln -s unsquashfs %{buildroot}%{_sbindir}/sqfscat %{_sbindir}/sqfscat %changelog +* Fri Feb 04 2022 Bruno Wolff III - 4.5-7.20220204git8a9d02e +- Continue testing upstream patches +- A makefile for mksquashfs is now included + * Wed Feb 02 2022 Bruno Wolff III - 4.5-6.20220202git11c9591 -- Continue testing upstream pages +- Continue testing upstream patches - This includes help text changes * Fri Jan 28 2022 Bruno Wolff III - 4.5-5.20220128gitd5a583e