diff --git a/squashfs-4.2-Makefile_config.patch b/squashfs-4.2-Makefile_config.patch deleted file mode 100644 index acb6dcf..0000000 --- a/squashfs-4.2-Makefile_config.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- squashfs4.2.orig/squashfs-tools/Makefile 2011-02-28 21:04:15.000000000 +0100 -+++ squashfs4.2/build/squashfs-tools/Makefile 2011-03-02 14:21:00.776818880 +0100 -@@ -37,7 +37,7 @@ - # LZO_SUPPORT line below. If needed, uncomment and set LZO_DIR to the - # installation prefix. - # --#LZO_SUPPORT = 1 -+LZO_SUPPORT = 1 - #LZO_DIR = /usr/local - - ########### Building LZMA support ############# -@@ -58,8 +58,8 @@ - # and uncomment the LZMA_SUPPORT line below. - # - #LZMA_XZ_SUPPORT = 1 --#LZMA_SUPPORT = 1 --#LZMA_DIR = ../../../../LZMA/lzma465 -+LZMA_SUPPORT = 1 -+LZMA_DIR = ../.. - - ######## Specifying default compression ######## - # diff --git a/squashfs-4.4-Makefile_config.patch b/squashfs-4.4-Makefile_config.patch new file mode 100644 index 0000000..b4e309b --- /dev/null +++ b/squashfs-4.4-Makefile_config.patch @@ -0,0 +1,38 @@ +--- squashfs4.4/squashfs-tools/Makefile.orig 2020-12-31 18:14:20.736633721 +0000 ++++ squashfs4.4/squashfs-tools/Makefile 2020-12-31 18:18:43.416195072 +0000 +@@ -30,7 +30,7 @@ + # To build install the library and uncomment + # the XZ_SUPPORT line below. + # +-#XZ_SUPPORT = 1 ++XZ_SUPPORT = 1 + + + ############ Building LZO support ############## +@@ -44,7 +44,7 @@ + # To build install the library and uncomment + # the XZ_SUPPORT line below. + # +-#LZO_SUPPORT = 1 ++LZO_SUPPORT = 1 + + + ########### Building LZ4 support ############# +@@ -60,7 +60,7 @@ + # To build install and uncomment + # the LZ4_SUPPORT line below. + # +-#LZ4_SUPPORT = 1 ++LZ4_SUPPORT = 1 + + + ########### Building ZSTD support ############ +@@ -76,7 +76,7 @@ + # To build install the library and uncomment + # the XZ_SUPPORT line below. + # +-#ZSTD_SUPPORT = 1 ++ZSTD_SUPPORT = 1 + + + ######## Specifying default compression ######## diff --git a/squashfs.spec b/squashfs.spec index 9e79e59..841cf45 100644 --- a/squashfs.spec +++ b/squashfs.spec @@ -1,38 +1,45 @@ Name: squashfs -Version: 4.2 -Release: 2mamba -Summary: Tools for squashsh, a compressed read-only filesystem for Linux +Version: 4.4 +Release: 1mamba +Summary: Tools for Squashfs, a compressed read-only filesystem for Linux Group: System/Tools Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://squashfs.sourceforge.net/ -Source: http://heanet.dl.sourceforge.net/sourceforge/squashfs/squashfs%{version}.tar.gz +Source: http://downloads.sourceforge.net/sourceforge/squashfs/squashfs%{version}.tar.gz Source1: http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2 Patch0: %{name}-4.0-lzma.patch -Patch1: %{name}-4.2-Makefile_config.patch +Patch1: %{name}-4.4-Makefile_config.patch Patch2: %{name}-4.2-Makefile_xz.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: ldconfig +BuildRequires: liblz4-devel +BuildRequires: liblzma-devel +BuildRequires: liblzo-devel BuildRequires: libz-devel +BuildRequires: libzstd-devel ## AUTOBUILDREQ-END BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Squashfs is a compressed read-only filesystem for Linux. Squashfs is intended for general read-only filesystem use, for archival use (i.e. in cases where a .tar.gz file may be used), and in constrained block device/memory systems (e.g. embedded systems) where low overhead is needed. The filesystem is currently stable, and has been tested on PowerPC, i586, Sparc and ARM architectures. +%debug_package + %prep %setup -q -n %{name}%{version} -a1 -#%patch0 -p0 %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 %build mkdir build mv squashfs-tools build cd build/squashfs-tools -%make +%make \ + EXTRA_CFLAGS+="-fcommon" %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -47,9 +54,13 @@ install -D -m 0755 unsquashfs %{buildroot}%{_bindir}/unsquashfs %defattr(-,root,root) %{_bindir}/mksquashfs %{_bindir}/unsquashfs -%doc CHANGES COPYING README +%doc CHANGES COPYING +#README %changelog +* Thu Dec 31 2020 Silvan Calarco 4.4-1mamba +- update to 4.4 + * Sat May 21 2011 Silvan Calarco 4.2-2mamba - rebuilt with xz support