rpms/rfkill/EL-5 rfkill-rhel5-sysfs-path-fix.patch, NONE, 1.1 rfkill.spec, 1.3, 1.4

[John W. Linville]

Author: linville

Update of /cvs/pkgs/rpms/rfkill/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6991

Modified Files:
	rfkill.spec 
Added Files:
	rfkill-rhel5-sysfs-path-fix.patch 
Log Message:
Use correct sysfs path in EL-5 for looking-up device names

rfkill-rhel5-sysfs-path-fix.patch:
 rfkill.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rfkill-rhel5-sysfs-path-fix.patch ---
diff -up rfkill-0.3/rfkill.c.orig rfkill-0.3/rfkill.c
--- rfkill-0.3/rfkill.c.orig	2009-12-23 16:18:34.000000000 -0500
+++ rfkill-0.3/rfkill.c	2009-12-23 16:18:48.000000000 -0500
@@ -70,7 +70,7 @@ static const char *get_name(__u32 idx)
 	int fd;
 
 	snprintf(filename, sizeof(filename) - 1,
-				"/sys/class/rfkill/rfkill%u/name", idx);
+				"/sys/bus/rfkill/devices/rfkill%u/name", idx);
 
 	fd = open(filename, O_RDONLY);
 	if (fd < 0)


Index: rfkill.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rfkill/EL-5/rfkill.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rfkill.spec	29 Sep 2009 17:58:36 -0000	1.3
+++ rfkill.spec	23 Dec 2009 21:59:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rfkill
 Version:        0.3
-Release:        3%{?dist}
+Release:        3.1%{?dist}
 Summary:        A tool for enabling and disabling wireless devices
 
 Group:          System Environment/Base
@@ -10,6 +10,7 @@ Source0:        http://wireless.kernel.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         rfkill-default-install-to-PREFIX-sbin.patch
+Patch1:         rfkill-rhel5-sysfs-path-fix.patch
 
 %description
 rfkill is a simple tool for accessing the Linux rfkill device interface,
@@ -19,6 +20,7 @@ WLAN, Bluetooth and mobile broadband.
 %prep
 %setup -q
 %patch0 -p 1
+%patch1 -p 1
 
 
 %build
@@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 23 2009 John W. Linville <linville at tuxdriver.com> 0.3-3.1
+- Use correct sysfs path in EL-5 for looking-up device names
+
 * Tue Sep 29 2009 John W. Linville <linville at tuxdriver.com> 0.3-3
 - Install binary into /sbin to enable use during boot