From 58c1425aea87057134a82f9979ebd08db50f0899 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Sep 08 2011 15:00:10 +0000
Subject: Update to 3.1.4

Update udev rule again (#733326)

---

diff --git a/.gitignore b/.gitignore
index 862eaaa..673b5fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ gnome-bluetooth-2.90.0.tar.bz2
 /gnome-bluetooth-3.0.0.tar.bz2
 /gnome-bluetooth-3.0.1.tar.bz2
 /gnome-bluetooth-3.1.3.tar.bz2
+/gnome-bluetooth-3.1.4.tar.bz2
diff --git a/61-gnome-bluetooth-rfkill.rules b/61-gnome-bluetooth-rfkill.rules
index a76c1e7..d7d9650 100644
--- a/61-gnome-bluetooth-rfkill.rules
+++ b/61-gnome-bluetooth-rfkill.rules
@@ -1,11 +1,7 @@
 # Get access to /dev/rfkill for users
 # See https://bugzilla.redhat.com/show_bug.cgi?id=514798
 #
-# Updated for udev >= 154
-# http://bugs.debian.org/582188
-# https://bugzilla.redhat.com/show_bug.cgi?id=588660
+# 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+="udev-acl"
-LABEL="gnome_bluetooth_end"
+KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess"
diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index f8861a9..abe0cac 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -1,7 +1,7 @@
 Name:		gnome-bluetooth
 Epoch:		1
-Version:	3.1.3
-Release:	1%{?dist}
+Version:	3.1.4
+Release:	3%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -12,7 +12,6 @@ Source1:	61-gnome-bluetooth-rfkill.rules
 
 BuildRequires:	gtk3-devel >= 2.99.0
 BuildRequires:	GConf2-devel
-BuildRequires:	control-center-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	libnotify-devel
 %if 0
@@ -205,6 +204,10 @@ fi
 %endif
 
 %changelog
+* Thu Sep 08 2011 Bastien Nocera <bnocera@redhat.com> 3.1.4-3
+- Update to 3.1.4
+- Update udev rule again (#733326)
+
 * Mon Jul 04 2011 Bastien Nocera <bnocera@redhat.com> 3.1.3-1
 - Update to 3.1.3
 
diff --git a/sources b/sources
index b8517d6..39f8089 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6fc32d5cb650479807c062b449ff6071  gnome-bluetooth-3.1.3.tar.bz2
+b8d122aefddca91358bcb01af5243d27  gnome-bluetooth-3.1.4.tar.bz2