diff --git a/.cvsignore b/.cvsignore
index 2a35959..d4c3c5e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-squashfs4.0.tar.gz
+squashfs-4.1.tar.bz2
diff --git a/sources b/sources
index a2243ba..c264d51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3c23391da4ebab0ac4a75021ddabf96 squashfs4.0.tar.gz
+4be16f0856a8b933ca757ebc91180d86 squashfs-4.1.tar.bz2
diff --git a/squashfs-fix-unsquashing-v3.patch b/squashfs-fix-unsquashing-v3.patch
deleted file mode 100644
index 380e9d2..0000000
--- a/squashfs-fix-unsquashing-v3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur squashfs4.0/squashfs-tools/unsquash-3.c squashfs4.0.fix/squashfs-tools/unsquash-3.c
---- squashfs4.0/squashfs-tools/unsquash-3.c 2009-03-31 00:35:10.000000000 -0400
-+++ squashfs4.0.fix/squashfs-tools/unsquash-3.c 2010-05-05 23:09:00.112806775 -0400
-@@ -36,7 +36,7 @@
- sBlk.fragment_table_start);
-
- if(sBlk.fragments == 0)
-- return;
-+ return TRUE;
-
- if((fragment_table = malloc(sBlk.fragments *
- sizeof(squashfs_fragment_entry_3))) == NULL)
diff --git a/squashfs-tools.spec b/squashfs-tools.spec
index 15fb6e1..640c497 100644
--- a/squashfs-tools.spec
+++ b/squashfs-tools.spec
@@ -1,25 +1,27 @@
Summary: Utility for the creation of squashfs filesystems
Name: squashfs-tools
-Version: 4.0
-# cvs snapshot from cvs -d:pserver:anonymous@squashfs.cvs.sourceforge.net:/cvsroot/squashfs co squashfs on 2009-01-25
-Release: 4%{?dist}
+Version: 4.1
+Release: 0.1.20100607%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://squashfs.sf.net
-Source0: http://cdnetworks-us-2.dl.sourceforge.net/project/squashfs/squashfs/squashfs%{version}/squashfs%{version}.tar.gz
+# cvs -d:pserver:anonymous@squashfs.cvs.sourceforge.net:/cvsroot/squashfs export -D 2010-06-07 squashfs
+Source0: squashfs-4.1.tar.bz2
Patch0: squashfs-cflags.patch
-Patch1: squashfs-fix-unsquashing-v3.patch
+Patch1: squashfs-xz.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: zlib-devel
+BuildRequires: xz-devel
+BuildRequires: libattr-devel
%description
Squashfs is a highly compressed read-only filesystem for Linux. This package
contains the utilities for manipulating squashfs filesystems.
%prep
-%setup -q -n squashfs%{version}
-%patch0 -p1 -b .cflags
-%patch1 -p1 -b .fix-unsquashing-v3
+%setup -q -n squashfs
+%patch0 -p0
+%patch1 -p0
%build
pushd squashfs-tools
@@ -37,11 +39,15 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc README
-%doc README-4.0
/sbin/mksquashfs
%{_sbindir}/unsquashfs
%changelog
+* Wed Jun 08 2010 Bruno Wolff III <bruno@wolff.to> - 4.1-0.1.20100607
+- Rebase to 4.1 prerelease with xz wrapper
+- Provides lzma compression as an option.
+- squashfs-fix-unsquashing-v3.patch is part of the 4.1 prerelease
+
* Wed May 5 2010 Kyle McMartin <kyle@redhat.com> 4.0-4
- squashfs-fix-unsquashing-v3.patch: pull in fix from cvs. Thanks pkl!
(rhbz#523504)
diff --git a/squashfs-xz.patch b/squashfs-xz.patch
new file mode 100644
index 0000000..71fda95
--- /dev/null
+++ b/squashfs-xz.patch
@@ -0,0 +1,11 @@
+--- squashfs-tools/Makefile.orig 2010-02-13 14:05:21.000000000 -0600
++++ squashfs-tools/Makefile 2010-02-13 14:05:29.000000000 -0600
+@@ -11,7 +11,7 @@
+ # work) - download and unpack it, uncomment and set LZMA_DIR to unpacked source,
+ # and uncomment the LZMA_SUPPORT line below.
+
+-#XZ_SUPPORT = 1
++XZ_SUPPORT = 1
+ #LZMA_SUPPORT = 1
+ #LZMA_DIR = ../../../LZMA/lzma465
+