From dab178b3047f99e8636257f1de692ff5cf5a851adb428f6b7d5a8fb3ad53aba2 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 3 Nov 2010 09:44:36 +0000
Subject: [PATCH] Accepting request 52014 from
 home:coolo:branches:openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/52014
OBS-URL: https://build.opensuse.org/package/show/filesystems/squashfs?expand=0&rev=7
---
 squashfs-retval.patch | 10 ----------
 squashfs.changes      |  8 ++++++++
 squashfs.spec         | 19 ++++++-------------
 squashfs4.0.tar.gz    |  3 ---
 squashfs4.1.tar.gz    |  3 +++
 5 files changed, 17 insertions(+), 26 deletions(-)
 delete mode 100644 squashfs-retval.patch
 delete mode 100644 squashfs4.0.tar.gz
 create mode 100644 squashfs4.1.tar.gz

diff --git a/squashfs-retval.patch b/squashfs-retval.patch
deleted file mode 100644
index c1c4917..0000000
--- a/squashfs-retval.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- squashfs-tools/mksquashfs.c
-+++ squashfs-tools/mksquashfs.c
-@@ -1538,6 +1538,7 @@ int add_pending_fragment(struct file_buf
- 	pthread_mutex_lock(&fragment_mutex);
- 	insert_fragment_list(&frag_locked_list, entry);
- 	pthread_mutex_unlock(&fragment_mutex);
-+	return TRUE;
- }
- 
- 
diff --git a/squashfs.changes b/squashfs.changes
index 7354879..b3d2c1e 100644
--- a/squashfs.changes
+++ b/squashfs.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov  2 18:41:08 UTC 2010 - coolo@novell.com
+
+- update to 4.1
+  - support for lzo (>= 2.6.36) and lzma (not yet mainline)
+  - xattr support
+  - misc fixes for the tools
+
 -------------------------------------------------------------------
 Mon Sep 21 14:47:01 CEST 2009 - snwint@suse.de
 
diff --git a/squashfs.spec b/squashfs.spec
index 1bc6041..eef6ea7 100644
--- a/squashfs.spec
+++ b/squashfs.spec
@@ -19,14 +19,13 @@
 
 
 Name:           squashfs
-BuildRequires:  zlib-devel
+BuildRequires:  zlib-devel attr-devel
 License:        GPLv2+
 Group:          System/Filesystems
 Supplements:    filesystem(squashfs)
-Version:        4.0
+Version:        4.1
 Release:        1
-Source0:        squashfs4.0.tar.gz
-Patch:          squashfs-retval.patch
+Source0:        squashfs4.1.tar.gz
 Url:            http://squashfs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        A Read-Only File System with Efficient Compression
@@ -35,18 +34,12 @@ Summary:        A Read-Only File System with Efficient Compression
 This package contains the userland utilities to create and read
 squashfs images.
 
-
-
-Authors:
---------
-    Phillip Lougher
-
 %prep
 %setup -n squashfs%{version}
-%patch -p0
 
 %build
-make -C squashfs-tools CFLAGS="-I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $RPM_OPT_FLAGS"
+sed -i -e "s,-O2,%{optflags}," squashfs-tools/Makefile
+make -C squashfs-tools 
 
 %install
 mkdir -p $RPM_BUILD_ROOT/usr/bin
@@ -57,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc README README-4.0 PERFORMANCE.README CHANGES
+%doc README README-%version PERFORMANCE.README CHANGES
 /usr/bin/*squashfs
 
 %changelog
diff --git a/squashfs4.0.tar.gz b/squashfs4.0.tar.gz
deleted file mode 100644
index d0d972c..0000000
--- a/squashfs4.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18948edbe06bac2c4307eea99bfb962643e4b82e5b7edd541b4d743748e12e21
-size 103979
diff --git a/squashfs4.1.tar.gz b/squashfs4.1.tar.gz
new file mode 100644
index 0000000..4529806
--- /dev/null
+++ b/squashfs4.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a870d065a25b3f5467bc6d9ed34340befab51a3f9e4b7e3792ea0ff4e06046a
+size 122769