From bbdac42e5521ed8b6a58871c5d1acfb173e63b69 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 16 Apr 2012 08:15:03 +0400 Subject: [PATCH] Ver. 2.8.7 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + ...eses.patch => fuse-0001-More-parentheses.patch | 12 ++++++------ fuse.spec | 15 +++++++++------ sources | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) rename fuse-0002-More-parentheses.patch => fuse-0001-More-parentheses.patch (85%) diff --git a/.gitignore b/.gitignore index 4212e3e..5971f56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ fuse-2.8.4.tar.gz /fuse-2.8.5.tar.gz /fuse-2.8.6.tar.gz +/fuse-2.8.7.tar.gz diff --git a/fuse-0002-More-parentheses.patch b/fuse-0001-More-parentheses.patch similarity index 85% rename from fuse-0002-More-parentheses.patch rename to fuse-0001-More-parentheses.patch index bf0eef0..4d34710 100644 --- a/fuse-0002-More-parentheses.patch +++ b/fuse-0001-More-parentheses.patch @@ -1,7 +1,7 @@ -From 459c84a3e5fda1ef7f7060d44903b31215857e70 Mon Sep 17 00:00:00 2001 +From 22ba14e45e84e0bd12a9ab1c9d0460b9ae27c10c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 9 Aug 2010 12:10:40 +0400 -Subject: [PATCH 2/3] More parentheses +Subject: [PATCH 1/1] More parentheses Signed-off-by: Peter Lemenkov --- @@ -10,10 +10,10 @@ Signed-off-by: Peter Lemenkov 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/fuse.c b/lib/fuse.c -index 95cf50b..76c2681 100644 +index d511964..328ebba 100644 --- a/lib/fuse.c +++ b/lib/fuse.c -@@ -961,17 +961,15 @@ static int fuse_compat_open(struct fuse_fs *fs, const char *path, +@@ -991,17 +991,15 @@ static int fuse_compat_open(struct fuse_fs *fs, const char *path, { int err; if (!fs->compat || fs->compat >= 25) @@ -35,7 +35,7 @@ index 95cf50b..76c2681 100644 } diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c -index c519bfb..d6275b5 100644 +index c86a910..4f19d61 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -716,7 +716,7 @@ static void do_open(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) @@ -48,5 +48,5 @@ index c519bfb..d6275b5 100644 fuse_reply_open(req, &fi); } -- -1.7.3.1 +1.7.9.3 diff --git a/fuse.spec b/fuse.spec index ea2d555..9955c04 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,6 +1,6 @@ Name: fuse -Version: 2.8.6 -Release: 4%{?dist} +Version: 2.8.7 +Release: 1%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -9,7 +9,7 @@ URL: http://fuse.sf.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.conf -Patch2: fuse-0002-More-parentheses.patch +Patch1: fuse-0001-More-parentheses.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: kernel >= 2.6.14 Requires: which @@ -53,12 +53,12 @@ pgk-config) to develop FUSE based applications/filesystems. %setup -q #disable device creation during build/install sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in -%patch2 -p1 -b .add_parentheses +%patch1 -p1 -b .add_parentheses %build # Can't pass --disable-static here, or else the utils don't build -export MOUNT_FUSE_PATH="%{_sbindir}" -CFLAGS="%{optflags} -D_GNU_SOURCE" %configure +export MOUNT_FUSE_PATH="%{_sbindir}" +CFLAGS="%{optflags} -D_GNU_SOURCE" %configure make %{?_smp_mflags} %install @@ -118,6 +118,9 @@ fi %{_includedir}/fuse %changelog +* Mon Apr 16 2012 Peter Lemenkov - 2.8.7-1 +- Ver. 2.8.7 + * Sun Apr 15 2012 Kay Sievers - 2.8.6-4 - remove needless udev rule diff --git a/sources b/sources index 81017b2..3c4bcd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eaa32c8cef56a981656a786f258a002a fuse-2.8.6.tar.gz +001a12d8f5b4db461265e9661c7a5de4 fuse-2.8.7.tar.gz