From 9dd5c82e16235dfcc833162cb0ee9eae93a5376f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 May 2012 17:19:36 +0200
Subject: [PATCH] gnome-bluetooth: new rfkill udev rules file (Fedora),
 simplify.

---
 srcpkgs/gnome-bluetooth/INSTALL                 |  6 ------
 srcpkgs/gnome-bluetooth/REMOVE                  |  6 ------
 .../files/61-gnome-bluetooth-rfkill.rules       | 10 +++-------
 .../gnome-bluetooth-devel.template              |  6 ++----
 srcpkgs/gnome-bluetooth/template                | 17 +++++------------
 5 files changed, 10 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/gnome-bluetooth/INSTALL
 delete mode 100644 srcpkgs/gnome-bluetooth/REMOVE

diff --git a/srcpkgs/gnome-bluetooth/INSTALL b/srcpkgs/gnome-bluetooth/INSTALL
deleted file mode 100644
index d9ecaa1cf08..00000000000
--- a/srcpkgs/gnome-bluetooth/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	echo -n "Updating dynamic linker shared cache... "
-	ldconfig && echo "ok." || echo "FAILED!"
-	;;
-esac
diff --git a/srcpkgs/gnome-bluetooth/REMOVE b/srcpkgs/gnome-bluetooth/REMOVE
deleted file mode 100644
index d9ecaa1cf08..00000000000
--- a/srcpkgs/gnome-bluetooth/REMOVE
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	echo -n "Updating dynamic linker shared cache... "
-	ldconfig && echo "ok." || echo "FAILED!"
-	;;
-esac
diff --git a/srcpkgs/gnome-bluetooth/files/61-gnome-bluetooth-rfkill.rules b/srcpkgs/gnome-bluetooth/files/61-gnome-bluetooth-rfkill.rules
index a76c1e73cf7..d7d9650dc7b 100644
--- a/srcpkgs/gnome-bluetooth/files/61-gnome-bluetooth-rfkill.rules
+++ b/srcpkgs/gnome-bluetooth/files/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/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template b/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
index 30cd73fc45c..6e2b88e52bb 100644
--- a/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
+++ b/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'gnome-bluetooth-devel'.
 #
-depends="gtk+3-devel glib-devel gnome-bluetooth>=3.4.0"
+noarch=yes
+depends="gtk+3-devel glib-devel gnome-bluetooth>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-noarch=yes
-
-
 do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 3536a6b7a20..d23029a8b40 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,10 +1,12 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
 version=3.4.0
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--disable-desktop-update --disable-schemas-compile
---disable-icon-update"
+configure_args="--disable-desktop-update --disable-schemas-compile --disable-icon-update"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+subpackages="$pkgname-devel"
 depends="dconf bluez gvfs obexd-client hicolor-icon-theme desktop-file-utils"
 makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection libXi-devel gtk+3-devel libnotify-devel nautilus-sendto-devel"
 short_desc="The GNOME Bluetooth Subsystem"
@@ -22,15 +24,6 @@ long_desc="
  bluetooth-sendto is also included for sending files to Bluetooth devices
  via OBEX."
 
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="$pkgname-devel"
-
-
-
 post_install() {
-	vinstall ${FILESDIR}/61-gnome-bluetooth-rfkill.rules \
-		644 lib/udev/rules.d
-	vmkdir etc/ld.so.conf.d
-	echo "/usr/lib/gnome-bluetooth" > \
-		${DESTDIR}/etc/ld.so.conf.d/${pkgname}.conf
+	vinstall ${FILESDIR}/61-gnome-bluetooth-rfkill.rules 644 lib/udev/rules.d
 }