[gnome-bluetooth/f16] Update udev rule again (#733326)

[Bastien Nocera]

commit 07ba6f8d6c34f4cc3a1e6ca16c3445a2bef4522d
Author: Bastien Nocera <hadess at hadess.net>
Date:   Thu Sep 8 15:23:52 2011 +0100

    Update udev rule again (#733326)

 61-gnome-bluetooth-rfkill.rules |   14 ++++----------
 gnome-bluetooth.spec            |    5 ++++-
 2 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/61-gnome-bluetooth-rfkill.rules b/61-gnome-bluetooth-rfkill.rules
index 622549b..d7d9650 100644
--- a/61-gnome-bluetooth-rfkill.rules
+++ b/61-gnome-bluetooth-rfkill.rules
@@ -1,13 +1,7 @@
 # Get access to /dev/rfkill for users
-# See http://bugzilla.redhat.com/show_bug.cgi?id=514798
+# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
 #
-# Updated for udev >= 154
-# http://bugs.debian.org/582188
-# http://bugzilla.redhat.com/show_bug.cgi?id=588660
-#
-# Updated for udev >= 173 and systemd >= 33
+# Simplified by Kay Sievers
+# https://bugzilla.redhat.com/show_bug.cgi?id=733326
 
-ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end"
-ACTION!="add|change", GOTO="gnome_bluetooth_end"
-KERNEL=="rfkill", TAG+="uaccess"
-LABEL="gnome_bluetooth_end"
+KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess"
diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index 22b2857..37ecbb7 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -1,7 +1,7 @@
 Name:		gnome-bluetooth
 Epoch:		1
 Version:	3.1.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -204,6 +204,9 @@ fi
 %endif
 
 %changelog
+* Thu Sep 08 2011 Bastien Nocera <bnocera at redhat.com> 3.1.4-3
+- Update udev rule again (#733326)
+
 * Tue Aug 23 2011 Matthias Clasen <mclasen at redhat.com> 3.1.4-2
 - Update udev rule to work with udev >= 173 / systemd >= 33