rpms/fuse/F-12 fuse-udev_rules.patch, 1.8, 1.9 fuse.spec, 1.39, 1.40 import.log, 1.5, 1.6 fuse-makedev.d-fuse, 1.6, NONE fuse-udev.nodes, 1.3, NONE

Peter Lemenkov peter at fedoraproject.org
Thu Nov 19 19:15:23 UTC 2009


Author: peter

Update of /cvs/pkgs/rpms/fuse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7759/F-12

Modified Files:
	fuse-udev_rules.patch fuse.spec import.log 
Removed Files:
	fuse-makedev.d-fuse fuse-udev.nodes 
Log Message:
Removed MAKEDEV usage and fixed udev rule

fuse-udev_rules.patch:
 udev.rules |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-12/fuse-udev_rules.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fuse-udev_rules.patch	20 Feb 2008 21:38:16 -0000	1.8
+++ fuse-udev_rules.patch	19 Nov 2009 19:15:23 -0000	1.9
@@ -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"


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-12/fuse.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- fuse.spec	28 Sep 2009 09:17:00 -0000	1.39
+++ fuse.spec	19 Nov 2009 19:15:23 -0000	1.40
@@ -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 $RP
 
 # 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_serv
 %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 at gmail.com> 2.8.1-3
+- Fixed udev rules (bz# 538606)
+
+* Thu Nov 19 2009 Peter Lemenkov <lemenkov at gmail.com> 2.8.1-2
+- Removed support for MAKEDEV (bz# 511220)
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.8.1-1
 - Ver. 2.8.1
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-12/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	28 Sep 2009 09:17:00 -0000	1.5
+++ import.log	19 Nov 2009 19:15:23 -0000	1.6
@@ -3,3 +3,4 @@ fuse-2_7_4-1_fc9:HEAD:fuse-2.7.4-1.fc9.s
 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:F-12:fuse-2.8.1-3.fc12.src.rpm:1258658084


--- fuse-makedev.d-fuse DELETED ---


--- fuse-udev.nodes DELETED ---




More information about the fedora-extras-commits mailing list