rpms/squashfs-tools/devel squashfs-xz.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 sources, 1.11, 1.12 squashfs-tools.spec, 1.26, 1.27 squashfs-fix-unsquashing-v3.patch, 1.1, NONE

[Bruno Wolff III]

Author: bruno

Update of /cvs/pkgs/rpms/squashfs-tools/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22458

Modified Files:
	.cvsignore sources squashfs-tools.spec 
Added Files:
	squashfs-xz.patch 
Removed Files:
	squashfs-fix-unsquashing-v3.patch 
Log Message:
Move to 4.1 prerelease version.



squashfs-xz.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE squashfs-xz.patch ---
--- 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
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	18 Feb 2010 19:00:23 -0000	1.13
+++ .cvsignore	11 Jun 2010 16:43:34 -0000	1.14
@@ -1 +1 @@
-squashfs4.0.tar.gz
+squashfs-4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	18 Feb 2010 19:00:23 -0000	1.11
+++ sources	11 Jun 2010 16:43:35 -0000	1.12
@@ -1 +1 @@
-a3c23391da4ebab0ac4a75021ddabf96  squashfs4.0.tar.gz
+4be16f0856a8b933ca757ebc91180d86  squashfs-4.1.tar.bz2


Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/squashfs-tools.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- squashfs-tools.spec	6 May 2010 03:19:24 -0000	1.26
+++ squashfs-tools.spec	11 Jun 2010 16:43:35 -0000	1.27
@@ -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 at 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 at 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 at 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 at redhat.com> 4.0-4
 - squashfs-fix-unsquashing-v3.patch: pull in fix from cvs. Thanks pkl!
   (rhbz#523504)


--- squashfs-fix-unsquashing-v3.patch DELETED ---