rpms/fuse
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Correct udev rules

Browse Source
This commit is contained in:
Peter Lemenkov 2006-02-13 11:10:34 +00:00
parent f080a76115
commit 97e6ea6d8c
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fuse-udev_rules.patch
View File

@ -1,5 +1,26 @@
diff -u util.org/udev.rules util/udev.rules --- util/Makefile.am 2006-02-02 20:04:53.000000000 +0300
--- util.org/udev.rules 2005-11-03 19:38:05.000000000 +0100 +++ 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 +++ util/udev.rules 2005-11-03 19:38:13.000000000 +0100
@@ -1 +1 @@ @@ -1 +1 @@
-KERNEL="fuse", NAME="%k", MODE="0666" -KERNEL="fuse", NAME="%k", MODE="0666"

17
fuse.spec
View File

@ -1,6 +1,6 @@
Name: fuse Name: fuse
Version: 2.5.2 Version: 2.5.2
Release: 2%{?dist} Release: 3%{?dist}
Summary: File System in Userspace (FUSE) utilities Summary: File System in Userspace (FUSE) utilities
Group: System Environment/Base Group: System Environment/Base
@ -11,8 +11,7 @@ Source1: fuse-udev.nodes
Source2: fuse-makedev.d-fuse Source2: fuse-makedev.d-fuse
Source3: fuse-README.fedora Source3: fuse-README.fedora
#Patch0: fuse-mount.fuse.patch Patch0: fuse-udev_rules.patch
Patch1: fuse-udev_rules.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: kernel >= 2.6.14 Requires: kernel >= 2.6.14
Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/groupadd
@ -56,8 +55,7 @@ pgk-config) to develop FUSE based applications/filesystems.
%setup -q %setup -q
#disable device creation during build/install #disable device creation during build/install
sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
#%patch0 -b .patch0 %patch0 -b .patch0
%patch1 -b .patch1
cp %{SOURCE3} README.fedora cp %{SOURCE3} README.fedora
%build %build
@ -71,7 +69,7 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' 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 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 # change from 4755 to 0755 to allow stripping -- fixed later in files
chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
@ -103,8 +101,8 @@ fi
/sbin/mount.fuse /sbin/mount.fuse
%attr(4754,root,fuse) %{_bindir}/fusermount %attr(4754,root,fuse) %{_bindir}/fusermount
%{_sysconfdir}/makedev.d/z-fuse %{_sysconfdir}/makedev.d/z-fuse
%{_sysconfdir}/udev/rules.d/40-fuse.rules %{_sysconfdir}/udev/rules.d/60-fuse.rules
%{_sysconfdir}/udev/makedev.d/40-fuse.nodes %{_sysconfdir}/udev/makedev.d/60-fuse.nodes
%files libs %files libs
%doc COPYING.LIB %doc COPYING.LIB
@ -118,6 +116,9 @@ fi
%{_includedir}/fuse %{_includedir}/fuse
%changelog %changelog
* Mon Feb 13 2006 Peter Lemenkov <lemenkov@newmail.ru> - 2.5.2-3
- Proper udev rule
* Mon Feb 13 2006 Peter Lemenkov <lemenkov@newmail.ru> - 2.5.2-2 * Mon Feb 13 2006 Peter Lemenkov <lemenkov@newmail.ru> - 2.5.2-2
- Added missing requires - Added missing requires