From 5719b8c2bd443dc3a6aaa819143b388197654046 Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno@wolff.to>
Date: Sat, 1 Jan 2011 10:53:21 -0600
Subject: [PATCH] Update to latest upstream snapshot

---
 .gitignore          |  1 +
 sources             |  2 +-
 squashfs-tools.spec | 11 ++++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d6525da..2affc6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ squashfs-4.1.tar.bz2
 /squashfs4.1.tar.gz
 /squashfs-4.2-2010-12-23.bz2
 /squashfs-4.2-20101223.bz2
+/squashfs-4.2-20101231.bz2
diff --git a/sources b/sources
index 65bc832..999a8ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f469886476bf4a7774cb33e04767892  squashfs-4.2-20101223.bz2
+3f5e167796a3b2dbf1a4457d27c72e3c  squashfs-4.2-20101231.bz2
diff --git a/squashfs-tools.spec b/squashfs-tools.spec
index 0a948e5..df63a6d 100644
--- a/squashfs-tools.spec
+++ b/squashfs-tools.spec
@@ -1,12 +1,12 @@
 Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
 Version: 4.2
-%global cvsdate 20101223
-Release: 0.1.%{cvsdate}%{?dist}
+%global cvsdate 20101231
+Release: 0.2.%{cvsdate}%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
-# cvs -z3 -d:pserver:anonymous@squashfs.cvs.sourceforge.net:/cvsroot/squashfs export -D %{cvsdate} -d squashfs-%{version}-%{cvsdate} squashfs
+# cvs -z3 -d:pserver:anonymous@squashfs.cvs.sourceforge.net:/cvsroot/squashfs export -D "%{cvsdate} 2359 UTC" -d squashfs-%{version}-%{cvsdate} squashfs
 # tar cfj squashfs-%{version}-%{cvsdate}.bz2 squashfs-%{version}-%{cvsdate}
 Source0: squashfs-%{version}-%{cvsdate}.bz2
 Patch0: squashfs-cflags.patch
@@ -47,6 +47,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/unsquashfs
 
 %changelog
+* Sat Jan 01 2011 Bruno Wolff III <bruno@wolff.to> - 4.2-0.2.20101231
+- Pull latest upstream snapshot
+- Includes check for matching compression type when adding to an existing image
+- Sample cvs command now includes timezone and specifies when on the date to use for the snapshot
+
 * Fri Dec 24 2010 Bruno Wolff III <bruno@wolff.to> - 4.2-0.1.20101223
 - Switch to 4.2 development snapshot to get new XZ support
 - LZMA and XZ (LZMA2) support are now different