rpms/fusecompress/devel fusecompress-log-vsprintf.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 fusecompress-2.5-gcc44.patch, 1.1, 1.2 fusecompress.spec, 1.16, 1.17 sources, 1.7, 1.8

[Toshio くらとみ]

Author: toshio

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

Modified Files:
	.cvsignore fusecompress-2.5-gcc44.patch fusecompress.spec 
	sources 
Added Files:
	fusecompress-log-vsprintf.patch 
Log Message:

* 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.
- Patch for vsprintf bug in new logging code.


fusecompress-log-vsprintf.patch:
 rlog.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE fusecompress-log-vsprintf.patch ---
diff -up tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/rlog/rlog.h.mine tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/rlog/rlog.h
--- tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/rlog/rlog.h.mine	2009-09-25 01:20:19.430963948 -0700
+++ tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/rlog/rlog.h	2009-09-25 01:20:42.285632156 -0700
@@ -3,6 +3,7 @@
 
 #include <syslog.h>
 #include <stdarg.h>
+#include <cstdio>
 #include <string>
 
 namespace rlog {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 May 2009 17:59:21 -0000	1.7
+++ .cvsignore	25 Sep 2009 09:48:45 -0000	1.8
@@ -1 +1 @@
-tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4.tar.gz
+tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.tar.gz

fusecompress-2.5-gcc44.patch:
 assert.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: fusecompress-2.5-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/fusecompress-2.5-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fusecompress-2.5-gcc44.patch	8 May 2009 17:55:50 -0000	1.1
+++ fusecompress-2.5-gcc44.patch	25 Sep 2009 09:48:45 -0000	1.2
@@ -13,15 +13,3 @@ diff -urp tex-fusecompress-ae67acae857c3
  #endif
 -
 +#endif
-diff -urp tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4/src/Memory.cpp tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4.goo/src/Memory.cpp
---- tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4/src/Memory.cpp	2009-04-13 16:27:20.000000000 +0200
-+++ tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4.goo/src/Memory.cpp	2009-05-08 19:32:17.737886540 +0200
-@@ -269,7 +269,7 @@ ssize_t Memory::readFullParent(char * &b
- 
- ssize_t Memory::readParent(char * &buf, size_t &len, off_t &offset, off_t block_offset) const
- {
--	size_t size = std::min(len, (size_t) block_offset - offset);
-+	size_t size = std::min(len, (size_t) (block_offset - offset));
- 	size_t osize = size;
- 
- 	ssize_t r = readFullParent(buf, size, offset);


Index: fusecompress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/fusecompress.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- fusecompress.spec	17 Sep 2009 06:19:56 -0000	1.16
+++ fusecompress.spec	25 Sep 2009 09:48:45 -0000	1.17
@@ -1,21 +1,20 @@
 Name:           fusecompress
-Version:        2.5
-Release:        3%{?dist}
+Version:        2.6
+Release:        1%{?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-ae67acae857c3948568505c362facc3c9c81edd4.tar.gz
+Source0:        http://download.github.com/tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.tar.gz
 Patch0:         fusecompress-2.5-gcc44.patch
 Patch1:         fusecompress-2.5-ppc.patch
+# Patch already upstream
+Patch2:         fusecompress-log-vsprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  rlog-devel fuse-devel file-devel boost-devel
+BuildRequires:  fuse-devel file-devel boost-devel
 BuildRequires:  zlib-devel bzip2-devel lzo-devel lzma-devel
-# Ships with link to automake's config.sub
-# to raz pekne vybuchne
-BuildRequires:  automake
 Requires:       fuse
 
 
@@ -27,12 +26,12 @@ compressed files and user applications.
 
 
 %prep
-%setup -q -n tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4
+%setup -q -n tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb
 %patch0 -p1 -b .gcc44
 %patch1 -p1 -b .ppc
+%patch2 -p1 -b .vsprintf
 find . -name ChangeLog -o -name '*.[ch]pp' |xargs chmod -x
 
-
 %build
 %configure --with-boost-libdir=%{_libdir}
 make %{?_smp_mflags}
@@ -53,12 +52,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/fusecompress
 %{_bindir}/fusecompress_offline
 %{_bindir}/print_compress
+%{_bindir}/mount.fusecompress
 %{_mandir}/man1/fusecompress.1*
 %{_mandir}/man1/fusecompress_offline.1*
 %doc ChangeLog README AUTHORS COPYING NEWS
 
 
 %changelog
+* 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.
+- Patch for vsprintf bug in new logging code.
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.5-3
 - Rebuilt with new fuse
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 May 2009 17:59:21 -0000	1.7
+++ sources	25 Sep 2009 09:48:45 -0000	1.8
@@ -1 +1 @@
-7198d0370b3e7d5d90e0a02bbb8f701b  tex-fusecompress-ae67acae857c3948568505c362facc3c9c81edd4.tar.gz
+758ec3b21d7576b77b22e223abf2bd6d  tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.tar.gz