diff --git a/fuse-udev_rules.patch b/fuse-udev_rules.patch index d641c4a..cd0f91c 100644 --- a/fuse-udev_rules.patch +++ b/fuse-udev_rules.patch @@ -1,5 +1,26 @@ -diff -u util.org/udev.rules util/udev.rules ---- util.org/udev.rules 2005-11-03 19:38:05.000000000 +0100 +--- util/Makefile.am 2006-02-02 20:04:53.000000000 +0300 ++++ util/Makefile.am 2006-02-13 14:01:10.000000000 +0300 +@@ -24,7 +24,7 @@ + + install-data-local: + $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH) +- $(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules ++ $(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules + + uninstall-local: + rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse +--- util/Makefile.in 2006-02-13 13:56:18.000000000 +0300 ++++ util/Makefile.in 2006-02-13 14:01:20.000000000 +0300 +@@ -465,7 +465,7 @@ + + install-data-local: + $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH) +- $(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules ++ $(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules + + uninstall-local: + rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse +--- util/udev.rules 2005-11-03 19:38:05.000000000 +0100 +++ util/udev.rules 2005-11-03 19:38:13.000000000 +0100 @@ -1 +1 @@ -KERNEL="fuse", NAME="%k", MODE="0666" diff --git a/fuse.spec b/fuse.spec index 8ff30d8..be92e81 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,6 +1,6 @@ Name: fuse Version: 2.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -11,8 +11,7 @@ Source1: fuse-udev.nodes Source2: fuse-makedev.d-fuse Source3: fuse-README.fedora -#Patch0: fuse-mount.fuse.patch -Patch1: fuse-udev_rules.patch +Patch0: fuse-udev_rules.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: kernel >= 2.6.14 Requires(pre): %{_sbindir}/groupadd @@ -56,8 +55,7 @@ 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 -%patch1 -b .patch1 +%patch0 -b .patch0 cp %{SOURCE3} README.fedora %build @@ -71,7 +69,7 @@ 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 {} ';' -install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/40-fuse.nodes +install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/60-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 @@ -103,8 +101,8 @@ fi /sbin/mount.fuse %attr(4754,root,fuse) %{_bindir}/fusermount %{_sysconfdir}/makedev.d/z-fuse -%{_sysconfdir}/udev/rules.d/40-fuse.rules -%{_sysconfdir}/udev/makedev.d/40-fuse.nodes +%{_sysconfdir}/udev/rules.d/60-fuse.rules +%{_sysconfdir}/udev/makedev.d/60-fuse.nodes %files libs %doc COPYING.LIB @@ -118,6 +116,9 @@ fi %{_includedir}/fuse %changelog +* Mon Feb 13 2006 Peter Lemenkov - 2.5.2-3 +- Proper udev rule + * Mon Feb 13 2006 Peter Lemenkov - 2.5.2-2 - Added missing requires