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

Removed MAKEDEV usage and fixed udev rule

Browse Source
This commit is contained in:
Peter Lemenkov 2009-11-19 19:13:52 +00:00
parent aec3cc6a3e
commit b5193c757a
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuse-makedev.d-fuse
View File

@ -1 +0,0 @@
c 666 root root 10 229 1 1 fuse

1
fuse-udev.nodes
View File

@ -1 +0,0 @@
fuse

2
fuse-udev_rules.patch
View File

@ -2,4 +2,4 @@
+++ util/udev.rules 2005-11-03 19:38:13.000000000 +0100
@@ -1 +1 @@
-KERNEL=="fuse", MODE="0666"
+KERNEL=="fuse", NAME="%k", MODE="0666",OWNER="root",GROUP="root"
+KERNEL=="fuse", MODE="0666",OWNER="root",GROUP="root"

19
fuse.spec
View File

@ -1,14 +1,12 @@
Name: fuse
Version: 2.8.1
Release: 1%{?dist}
Release: 3%{?dist}
Summary: File System in Userspace (FUSE) utilities
Group: System Environment/Base
License: GPL+
URL: http://fuse.sf.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: fuse-udev.nodes
Source2: fuse-makedev.d-fuse
Patch0: fuse-udev_rules.patch
Patch1: fuse-openfix.patch
@ -17,7 +15,6 @@ Requires: kernel >= 2.6.14
Requires: which
BuildRequires: libselinux-devel
Requires(post): MAKEDEV
Requires(preun): chkconfig
Requires(preun): initscripts
@ -69,9 +66,6 @@ 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/bin/fusermount
# Put pc file in correct place
@ -80,6 +74,7 @@ mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir}
# Get rid of static libs
rm -f $RPM_BUILD_ROOT/%{_lib}/*.a
# No need to create init-script
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/fuse
# Compatibility symlinks
@ -91,8 +86,6 @@ ln -s /bin/ulockmgr_server ulockmgr_server
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/MAKEDEV fuse
%preun
if [ -f /etc/init.d/fuse ] ; then
@ -111,12 +104,10 @@ fi
/sbin/mount.fuse
%attr(4755,root,root) /bin/fusermount
/bin/ulockmgr_server
%{_sysconfdir}/makedev.d/z-fuse
# Compat symlinks
%{_bindir}/fusermount
%{_bindir}/ulockmgr_server
%config %{_sysconfdir}/udev/rules.d/99-fuse.rules
%config %{_sysconfdir}/udev/makedev.d/99-fuse.nodes
%files libs
%defattr(-,root,root,-)
@ -134,6 +125,12 @@ fi
%{_includedir}/fuse
%changelog
* Thu Nov 19 2009 Peter Lemenkov <lemenkov@gmail.com> 2.8.1-3
- Fixed udev rules (bz# 538606)
* Thu Nov 19 2009 Peter Lemenkov <lemenkov@gmail.com> 2.8.1-2
- Removed support for MAKEDEV (bz# 511220)
* Thu Sep 17 2009 Peter Lemenkov <lemenkov@gmail.com> 2.8.1-1
- Ver. 2.8.1

1
import.log
View File

@ -3,3 +3,4 @@ fuse-2_7_4-1_fc9:HEAD:fuse-2.7.4-1.fc9.src.rpm:1222597934
fuse-2_7_4-2_fc10:HEAD:fuse-2.7.4-2.fc10.src.rpm:1233157758
fuse-2_8_0-1_fc11:HEAD:fuse-2.8.0-1.fc11.src.rpm:1253089638
fuse-2_8_1-1_fc11:HEAD:fuse-2.8.1-1.fc11.src.rpm:1254129320
fuse-2_8_1-3_fc12:HEAD:fuse-2.8.1-3.fc12.src.rpm:1258657884