rpms/fusecompress/devel README.fedora, NONE, 1.1 fusecompress-xz-port.patch, NONE, 1.1 fusecompress.spec, 1.17, 1.18

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/fusecompress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23214

Modified Files:
	fusecompress.spec 
Added Files:
	README.fedora fusecompress-xz-port.patch 
Log Message:

* Fri Sep 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-2
- Port code to newer liblzma as provided by xz.



--- NEW FILE README.fedora ---
If you have fusecompress filesystems created prior to Fedora 12, you will need
to update them to the new on disk format in order to use them with this version
of fusecompress.  Install the fusecompress1 package via yum and read the
README.fedora file there for instructions::

    su -c yum install -y fusecompress1
    less /usr/share/doc/fusecompress1*/README.fedora

fusecompress-xz-port.patch:
 lzma.cpp |   12 ++++++------
 lzma.hpp |   14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

--- NEW FILE fusecompress-xz-port.patch ---
Index: tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/iostreams/filter/lzma.cpp
===================================================================
--- tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.orig/src/boost/iostreams/filter/lzma.cpp
+++ tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/iostreams/filter/lzma.cpp
@@ -28,10 +28,10 @@ namespace lzma {
 
                     // Compression levels
 
-const lzma_easy_level no_compression       = LZMA_EASY_COPY;
-const lzma_easy_level best_speed           = LZMA_EASY_LZMA2_1;
-const lzma_easy_level best_compression     = LZMA_EASY_LZMA_9;
-const lzma_easy_level default_compression  = LZMA_EASY_LZMA_7;
+const uint32_t no_compression       = 0;
+const uint32_t best_speed           = 1;
+const uint32_t best_compression     = 9;
+const uint32_t default_compression  = 2;
 
                     // Status codes
 
@@ -39,7 +39,7 @@ const int okay                 = LZMA_OK
 const int stream_end           = LZMA_STREAM_END;
 const int unsupported_check    = LZMA_UNSUPPORTED_CHECK;
 const int mem_error            = LZMA_MEM_ERROR;
-const int header_error         = LZMA_HEADER_ERROR;
+const int options_error        = LZMA_OPTIONS_ERROR;
 const int data_error           = LZMA_DATA_ERROR;
 const int buf_error            = LZMA_BUF_ERROR;
 const int prog_error           = LZMA_PROG_ERROR;
@@ -135,7 +135,7 @@ void lzma_base::do_init
 
     lzma_error::check(
         compress ?
-            lzma_easy_encoder(s, p.level) :
+            lzma_easy_encoder(s, p.level, LZMA_CHECK_CRC32) :
             lzma_stream_decoder(s, 100 * 1024 * 1024, 0 )
     );
 }
Index: tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/iostreams/filter/lzma.hpp
===================================================================
--- tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.orig/src/boost/iostreams/filter/lzma.hpp
+++ tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/iostreams/filter/lzma.hpp
@@ -47,10 +47,10 @@ typedef void (*free_func)(void*, void*);
 
                     // Compression levels
 
-BOOST_IOSTREAMS_DECL extern const lzma_easy_level no_compression;
-BOOST_IOSTREAMS_DECL extern const lzma_easy_level best_speed;
-BOOST_IOSTREAMS_DECL extern const lzma_easy_level best_compression;
-BOOST_IOSTREAMS_DECL extern const lzma_easy_level default_compression;
+BOOST_IOSTREAMS_DECL extern const uint32_t no_compression;
+BOOST_IOSTREAMS_DECL extern const uint32_t best_speed;
+BOOST_IOSTREAMS_DECL extern const uint32_t best_compression;
+BOOST_IOSTREAMS_DECL extern const uint32_t default_compression;
 
                     // Status codes
 
@@ -58,7 +58,7 @@ BOOST_IOSTREAMS_DECL extern const int ok
 BOOST_IOSTREAMS_DECL extern const int stream_end;
 BOOST_IOSTREAMS_DECL extern const int unsupported_check;
 BOOST_IOSTREAMS_DECL extern const int mem_error;
-BOOST_IOSTREAMS_DECL extern const int header_error;
+BOOST_IOSTREAMS_DECL extern const int options_error;
 BOOST_IOSTREAMS_DECL extern const int data_error;
 BOOST_IOSTREAMS_DECL extern const int buf_error;
 BOOST_IOSTREAMS_DECL extern const int prog_error;
@@ -88,10 +88,10 @@ const int null                          
 struct lzma_params {
 
     // Non-explicit constructor.
-    lzma_params( lzma_easy_level level = lzma::default_compression )
+    lzma_params( uint32_t level = lzma::default_compression )
         : level(level)
         { }
-    lzma_easy_level level;
+    uint32_t level;
 };
 
 //


Index: fusecompress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/fusecompress.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fusecompress.spec	25 Sep 2009 09:48:45 -0000	1.17
+++ fusecompress.spec	25 Sep 2009 12:43:14 -0000	1.18
@@ -1,20 +1,24 @@
 Name:           fusecompress
 Version:        2.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        FUSE based compressed filesystem implementation
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://miio.net/fusecompress/
 Source0:        http://download.github.com/tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.tar.gz
+Source1:        README.fedora
 Patch0:         fusecompress-2.5-gcc44.patch
 Patch1:         fusecompress-2.5-ppc.patch
 # Patch already upstream
 Patch2:         fusecompress-log-vsprintf.patch
+# Patch in upstream's bugtracker
+Patch3:         fusecompress-xz-port.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fuse-devel file-devel boost-devel
-BuildRequires:  zlib-devel bzip2-devel lzo-devel lzma-devel
+BuildRequires:  zlib-devel bzip2-devel lzo-devel
+BuildRequires:  xz-devel
 Requires:       fuse
 
 
@@ -30,8 +34,11 @@ compressed files and user applications.
 %patch0 -p1 -b .gcc44
 %patch1 -p1 -b .ppc
 %patch2 -p1 -b .vsprintf
+%patch3 -p1 -b .xzup
 find . -name ChangeLog -o -name '*.[ch]pp' |xargs chmod -x
 
+cp %{SOURCE1} .
+
 %build
 %configure --with-boost-libdir=%{_libdir}
 make %{?_smp_mflags}
@@ -55,10 +62,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mount.fusecompress
 %{_mandir}/man1/fusecompress.1*
 %{_mandir}/man1/fusecompress_offline.1*
-%doc ChangeLog README AUTHORS COPYING NEWS
+%doc ChangeLog README AUTHORS COPYING NEWS README.fedora
 
 
 %changelog
+* Fri Sep 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-2
+- Port code to newer liblzma as provided by xz.
+
 * Thu Sep 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-1
 - Update to 2.6.
 - Drop portion of gcc patch that's gone upstream.