From 3e671c20459c0805ed3445ea40369b92d266fe30 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Jan 12 2009 22:57:19 +0000
Subject: - update to cvs snap that generates v4.0 images


---

diff --git a/.cvsignore b/.cvsignore
index 62d6b9e..18aae99 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-squashfs3.4.tar.gz
+squashfs-20090112.tar.bz2
diff --git a/sources b/sources
index 3ff82b1..450bf52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a4d2995ad5aa6840c95a95ffa6b1da6  squashfs3.4.tar.gz
+73e3445f064d29a5f244afc1a9c8172a  squashfs-20090112.tar.bz2
diff --git a/squashfs-cflags.patch b/squashfs-cflags.patch
index 4225b29..75401b4 100644
--- a/squashfs-cflags.patch
+++ b/squashfs-cflags.patch
@@ -1,6 +1,6 @@
-diff -up squashfs3.4/squashfs-tools/Makefile.cflags squashfs3.4/squashfs-tools/Makefile
---- squashfs3.4/squashfs-tools/Makefile.cflags	2008-08-26 03:10:13.000000000 -0400
-+++ squashfs3.4/squashfs-tools/Makefile	2008-09-30 15:08:22.000000000 -0400
+diff -up squashfs/squashfs-tools/Makefile.cflags squashfs/squashfs-tools/Makefile
+--- squashfs/squashfs-tools/Makefile.cflags	2008-08-26 03:15:16.000000000 -0400
++++ squashfs/squashfs-tools/Makefile	2008-12-18 06:59:01.000000000 -0500
 @@ -2,7 +2,7 @@ INSTALL_DIR = /usr/local/bin
  
  INCLUDEDIR = .
@@ -8,5 +8,5 @@ diff -up squashfs3.4/squashfs-tools/Makefile.cflags squashfs3.4/squashfs-tools/M
 -CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
 +CFLAGS := $(RPM_OPT_FLAGS) -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
  
- all: mksquashfs unsquashfs
+ all: mksquashfs
  
diff --git a/squashfs-tools.spec b/squashfs-tools.spec
index 6bfcf2b..5f29429 100644
--- a/squashfs-tools.spec
+++ b/squashfs-tools.spec
@@ -1,11 +1,12 @@
 Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
-Version: 3.4
-Release: 1
+Version: 4.0
+# cvs snapshot from cvs -d:pserver:anonymous@squashfs.cvs.sourceforge.net:/cvsroot/squashfs co squashfs on 2009-01-12
+Release: 0.20090112
 License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
-Source0: squashfs3.4.tar.gz
+Source0: squashfs-20090112.tar.bz2
 Patch0: squashfs-cflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
@@ -15,7 +16,7 @@ Squashfs is a highly compressed read-only filesystem for Linux.  This package
 contains the utilities for manipulating squashfs filesystems.
 
 %prep
-%setup -q -n squashfs3.4
+%setup -q -n squashfs
 %patch0 -p1 -b .cflags
 
 %build
@@ -26,9 +27,9 @@ make RPM_OPT_FLAGS="%{optflags}"
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin $RPM_BUILD_ROOT/usr/sbin
 install -m 755 squashfs-tools/mksquashfs $RPM_BUILD_ROOT/sbin/mksquashfs
-install -m 755 squashfs-tools/unsquashfs $RPM_BUILD_ROOT%{_sbindir}/unsquashfs
+#install -m 755 squashfs-tools/unsquashfs $RPM_BUILD_ROOT%{_sbindir}/unsquashfs
 
-chmod -x README PERFORMANCE.README COPYING ACKNOWLEDGEMENTS CHANGES
+chmod -x README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -36,11 +37,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README PERFORMANCE.README COPYING ACKNOWLEDGEMENTS CHANGES
+%doc README
 /sbin/mksquashfs
-%{_sbindir}/unsquashfs
+#%{_sbindir}/unsquashfs
 
 %changelog
+* Mon Jan 12 2009  <katzj@redhat.com> - 4.0-0.20090112
+- update to cvs snap that generates v4.0 images
+
 * Tue Sep 30 2008 Jeremy Katz <katzj@redhat.com> - 3.4-1
 - update to 3.4