[fusecompress] * Tue Aug 17 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-8.20100223git754bc0de - Patch for

[Toshio くらとみ]

commit 41fc48cc90ed82bc9d2925d0ab314c5b8db31f54
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Aug 17 04:34:47 2010 -0400

    * Tue Aug 17 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-8.20100223git754bc0de
    - Patch for newer boost

 fusecompress-2.5-gcc44.patch  |   17 ++++++++++-------
 fusecompress-boost-1.44.patch |   31 +++++++++++++++++++++++++++++++
 fusecompress.spec             |   13 ++++++++++++-
 3 files changed, 53 insertions(+), 8 deletions(-)
---
diff --git a/fusecompress-2.5-gcc44.patch b/fusecompress-2.5-gcc44.patch
index 46ce889..675dec9 100644
--- a/fusecompress-2.5-gcc44.patch
+++ b/fusecompress-2.5-gcc44.patch
@@ -1,17 +1,20 @@
-diff --git a/src/assert.h b/src/assert.h
-index a02228a..a99be75 100644
---- a/src/assert.h
-+++ b/src/assert.h
-@@ -17,6 +17,8 @@
+Index: fusecompress-2.6/src/assert.h
+===================================================================
+--- fusecompress-2.6.orig/src/assert.h
++++ fusecompress-2.6/src/assert.h
+@@ -17,8 +17,11 @@
      along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
  */
  
 +#include "/usr/include/assert.h"
-+#if 0
  #ifndef ASSERT_H
++#ifndef _ASSERT_H
  #define ASSERT_H
++#define _ASSERT_H
  
-@@ -30,4 +32,4 @@
+ #include <rlog/rlog.h>
+ #include <stdlib.h>
+@@ -30,4 +33,4 @@
  	}
  
  #endif
diff --git a/fusecompress-boost-1.44.patch b/fusecompress-boost-1.44.patch
new file mode 100644
index 0000000..b144039
--- /dev/null
+++ b/fusecompress-boost-1.44.patch
@@ -0,0 +1,31 @@
+Index: fusecompress-2.6/configure.ac
+===================================================================
+--- fusecompress-2.6.orig/configure.ac
++++ fusecompress-2.6/configure.ac
+@@ -57,7 +57,7 @@ AC_RUN_IFELSE([
+ #include <boost/iostreams/device/file_descriptor.hpp>
+ int main(int argc, char **argv) {
+ 	int fd = open("bigfs.tmp", O_RDWR|O_CREAT, 0666);
+-	boost::iostreams::file_descriptor file(fd);
++	boost::iostreams::file_descriptor file(fd, boost::iostreams::never_close_handle);
+ 	long long ret = file.seek(3*1024*1024*1024LL, std::ios_base::beg);
+ 	return ret == 3*1024*1024*1024LL ? 0 : 1;
+ }],
+Index: fusecompress-2.6/src/boost/iostreams/device/nonclosable_file_descriptor.hpp
+===================================================================
+--- fusecompress-2.6.orig/src/boost/iostreams/device/nonclosable_file_descriptor.hpp
++++ fusecompress-2.6/src/boost/iostreams/device/nonclosable_file_descriptor.hpp
+@@ -19,11 +19,11 @@ public:
+ 
+     nonclosable_file_descriptor() : file_descriptor() { }
+     explicit nonclosable_file_descriptor(int fd)
+-        : file_descriptor(fd, false)
++        : file_descriptor(fd, boost::iostreams::never_close_handle)
+         { }
+ #ifdef BOOST_IOSTREAMS_WINDOWS
+     explicit nonclosable_file_descriptor(handle_type handle)
+-        : file_descriptor(handle, false)
++        : file_descriptor(handle, never_close_handle)
+         { }
+ #endif
+     explicit nonclosable_file_descriptor( const std::string& path,
diff --git a/fusecompress.spec b/fusecompress.spec
index 14c5d25..e480690 100644
--- a/fusecompress.spec
+++ b/fusecompress.spec
@@ -1,6 +1,6 @@
 Name:           fusecompress
 Version:        2.6
-Release:        7.20100223git754bc0de%{?dist}
+Release:        8.20100223git754bc0de%{?dist}
 Summary:        FUSE based compressed filesystem implementation
 
 Group:          System Environment/Libraries
@@ -14,12 +14,16 @@ URL:            http://miio.net/fusecompress/
 # tar -cvf -  fusecompress-2.6 |xz -c > fusecompress-20100223.tar.xz
 Source0: fusecompress-20100223.tar.xz
 Source1:        README.fedora
+# https://developer.berlios.de/bugs/?func=detailbug&bug_id=17438&group_id=5384
 Patch0:         fusecompress-2.5-gcc44.patch
+# https://developer.berlios.de/bugs/?func=detailbug&bug_id=17437&group_id=5384
+Patch1:         fusecompress-boost-1.44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fuse-devel file-devel boost-devel
 BuildRequires:  zlib-devel bzip2-devel lzo-devel
 BuildRequires:  xz-devel
+BuildRequires:  autoconf automake libtool
 Requires:       fuse
 
 
@@ -33,6 +37,9 @@ compressed files and user applications.
 %prep
 %setup -q -n fusecompress-%{version}
 %patch0 -p1 -b .gcc44
+%patch1 -p1 -b .boost
+autoreconf -fi
+
 find . -name ChangeLog -o -name '*.[ch]pp' |xargs chmod -x
 
 cp %{SOURCE1} .
@@ -65,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 17 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-8.20100223git754bc0de
+- Patch for newer boost
+- Make sure our patches are upstream
+
 * Fri Jul 30 2010 Lubomir Rintel <lkundrak at v3.sk> - 2.6-7.20100223git754bc0de
 - Rebuild for newer boost