From 1f2de82fe5b4213da92dcd6588464df2566f9663 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Fri, 23 Jun 2006 15:50:19 +0000
Subject: [PATCH] - update to 3.0 - include unsquashfs

---
 .cvsignore            |  2 +-
 sources               |  2 +-
 squashfs-cflags.patch | 12 ++++++------
 squashfs-tools.spec   | 18 ++++++++++++------
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 669c27d..1d8d7c2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-squashfs2.2-r2.tar.gz
+squashfs3.0.tar.gz
diff --git a/sources b/sources
index 079aad5..c9fa950 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a8d09a217240127ae4d339e8368d2de1  squashfs2.2-r2.tar.gz
+9fd05d0bfbb712f5fb95edafea5bc733  squashfs3.0.tar.gz
diff --git a/squashfs-cflags.patch b/squashfs-cflags.patch
index 1d8b9a2..6ae4d02 100644
--- a/squashfs-cflags.patch
+++ b/squashfs-cflags.patch
@@ -1,10 +1,10 @@
---- squashfs2.2-r2/squashfs-tools/Makefile.cflags	2005-12-01 14:53:27.000000000 -0500
-+++ squashfs2.2-r2/squashfs-tools/Makefile	2005-12-01 14:56:24.000000000 -0500
+--- squashfs3.0/squashfs-tools/Makefile.orig	2006-03-15 16:36:20.000000000 -0500
++++ squashfs3.0/squashfs-tools/Makefile	2006-06-23 11:47:53.000000000 -0400
 @@ -1,6 +1,6 @@
  INCLUDEDIR = .
  
--CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -g
-+CFLAGS := $(RPM_OPT_FLAGS) -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -g
+-CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2
++CFLAGS := $(RPM_OPT_FLAGS) -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2
+ 
+ all: mksquashfs unsquashfs
  
- mksquashfs: mksquashfs.o read_fs.o sort.o
- 	$(CC) mksquashfs.o read_fs.o sort.o -lz -o $@
diff --git a/squashfs-tools.spec b/squashfs-tools.spec
index 5264e0e..9304dd6 100644
--- a/squashfs-tools.spec
+++ b/squashfs-tools.spec
@@ -1,11 +1,11 @@
 Summary: squashfs utilities
 Name: squashfs-tools
-Version: 2.2r2
-Release: 2.2.1
+Version: 3.0
+Release: 1
 License: GPL
 Group: System Environment/Base
 URL: http://squashfs.sf.net
-Source0: squashfs2.2-r2.tar.gz
+Source0: squashfs3.0.tar.gz
 Patch0: squashfs-cflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
@@ -15,8 +15,8 @@ Squashfs is a highly compressed read-only filesystem for Linux.  This package
 contains the utilities for manipulating squashfs filesystems.
 
 %prep
-%setup -q -n squashfs2.2-r2
-%patch0 -p1
+%setup -q -n squashfs3.0
+%patch0 -p1 -b .cflags
 
 %build
 pushd squashfs-tools
@@ -24,8 +24,9 @@ make RPM_OPT_FLAGS="%{optflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/sbin
+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/usr/sbin/unsquashfs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,8 +36,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README PERFORMANCE.README COPYING ACKNOWLEDGEMENTS CHANGES
 /sbin/mksquashfs
+/usr/sbin/unsquashfs
 
 %changelog
+* Fri Jun 23 2006 Jeremy Katz <katzj@redhat.com> - 3.0-1
+- update to 3.0
+- include unsquashfs
+
 * Tue May 16 2006 Jeremy Katz <katzj@redhat.com> 
 - add BR on zlib-devel (Andreas Thienemann, #191880)