fuse: update to 2.8.4

- drop fuse group, change fusermount mode to 4755
- move fusermount/ulockmgr_server to /bin
- move libs to /%%{_lib}
- drop unneeded initscript



git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2017 ec354946-7b23-47d6-9f5a-488ba84defc7

f/fuse/fuse-vl.spec

@@ -1,8 +1,8 @@
 Summary:        File System in Userspace (FUSE) utilities
 Summary(ja):	ユーザスペースファイルシステム(FUSE)用のユーティリティ
 Name:           fuse
-Version:        2.8.3
+Version:        2.8.4
-Release:        3%{?_dist_release}
+Release:        1%{?_dist_release}
 
 Group:          System Environment/Base
 License:        GPL
@@ -13,7 +13,6 @@ Source1:	fuse-udev.nodes
 Source2:	fuse-makedev.d-fuse
 Patch0:		fuse-udev_rules.patch
 Patch1:		fuse-openfix.patch
-Patch2:		fuse-CVE-2009-3297.patch
 Patch10:	fuse-2.8.3-chkconfig.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
@@ -54,11 +53,15 @@ 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
-%patch0 -b .patch0
+%patch0 -b .udev-rules
-%patch10 -p1
+%patch1 -b .openfix
+%patch10 -p1 -b .chkconfig
 
 %build
 %configure \
+ --bindir=/bin \
+ --libdir=/%{_lib} \
+ --exec-prefix=/ \
  --disable-static \
  --disable-kernel-module 
 make %{?_smp_mflags}
@@ -68,13 +71,25 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
+
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
 # FIXME change from 60 to 99
 install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
-chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
+chmod 0755 $RPM_BUILD_ROOT/bin/fusermount
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir}
+
+# copmat symlinks
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s /bin/fusermount fusermount
+ln -s /bin/ulockmgr_server ulockmgr_server
 
+# drop unneeded initscript
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/fuse
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,28 +106,26 @@ fi
 
 %postun 
 /sbin/ldconfig
-if [ $1 = 0 ]; then
- %{_sbindir}/groupdel fuse || :
-fi
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING COPYING.LIB FAQ Filesystems NEWS README README.NFS
 /sbin/mount.fuse
-%attr(4754,root,fuse) %{_bindir}/fusermount
+%attr(4755,root,root) /bin/fusermount
+/bin/ulockmgr_server
+%{_bindir}/fusermount
 %{_bindir}/ulockmgr_server
-%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
 %config %{_sysconfdir}/udev/rules.d/99-fuse.rules
 %{_sysconfdir}/udev/makedev.d/99-fuse.nodes
-%{_libdir}/libfuse.so.*
+/%{_lib}/libfuse.so.*
-%{_libdir}/libulockmgr.so.*
+/%{_lib}/libulockmgr.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libfuse.so
+/%{_lib}/libfuse.so
-%{_libdir}/libulockmgr.so
+/%{_lib}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/fuse.h
 %{_includedir}/ulockmgr.h
@@ -120,6 +133,13 @@ fi
 
 
 %changelog
+* Sat Oct 09 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.8.4-1
+- new upstream release
+- drop fuse group, change fusermount mode to 4755
+- move fusermount/ulockmgr_server to /bin
+- move libs to /%%{_lib}
+- drop unneeded initscript
+
 * Thu Sep 30 2010 Shu KONNO <owa@bg.wakwak.com> 2.8.3-3
 - rebuilt with rpm-4.8.1 for pkg-config