[arch-commits] Commit in gnome-bluetooth/trunk (PKGBUILD gnome-bluetooth.install)

[Andrea Scarpino]

    Date: Tuesday, June 22, 2010 @ 13:16:41
  Author: andrea
Revision: 83709

use package function; removed || return 1; removed versioned deps; added information in .install

Modified:
  gnome-bluetooth/trunk/PKGBUILD
  gnome-bluetooth/trunk/gnome-bluetooth.install

-------------------------+
 PKGBUILD                |   33 +++++++++++++++++++++------------
 gnome-bluetooth.install |    3 +++
 2 files changed, 24 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-22 16:54:37 UTC (rev 83708)
+++ PKGBUILD	2010-06-22 17:16:41 UTC (rev 83709)
@@ -1,30 +1,39 @@
 # $Id$
-# Maintainer: Roman Kyrylych <roman at archlinux.org>
+# Maintainer:
+# Contributor: Roman Kyrylych <roman at archlinux.org>
 
 pkgname=gnome-bluetooth
 pkgver=2.30.0
 pkgrel=2
-pkgdesc="The GNOME Bluetooth Subsystem."
+pkgdesc="The GNOME Bluetooth Subsystem"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeBluetooth"
 license=('GPL' 'LGPL')
-depends=('bluez>=4.63' 'libunique>=1.1.6' 'libnotify>=0.4.5' 'gconf>=2.28.1' 'hicolor-icon-theme' 'gvfs-obexftp>=1.6.1' 'obexd>=0.22')
-makedepends=('intltool' 'pygtk>=2.16.0' 'gnome-doc-utils>=0.20.0' 'nautilus-sendto' 'gobject-introspection' 'gir-repository')
+depends=('libunique' 'libnotify' 'gconf' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd')
+makedepends=('intltool' 'pygtk' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection' 'gir-repository')
 replaces=('bluez-gnome')
 conflicts=('bluez-gnome')
 options=('!libtool' '!emptydirs' '!makeflags')
-install=gnome-bluetooth.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/2.30/${pkgname}-${pkgver}.tar.bz2)
+install=${pkgname}.install
+source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2")
 sha256sums=('4caafa8c28195c81d8c51414f3a64489f81b9b46cac56979aeaaff8c9ebb78d4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --disable-desktop-update --disable-icon-update || return 1
-  make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --disable-desktop-update \
+    --disable-icon-update
+  make
+}
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-bluetooth2 ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+
+  install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \
+    --domain gnome-bluetooth2 ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Modified: gnome-bluetooth.install
===================================================================
--- gnome-bluetooth.install	2010-06-22 16:54:37 UTC (rev 83708)
+++ gnome-bluetooth.install	2010-06-22 17:16:41 UTC (rev 83709)
@@ -3,6 +3,9 @@
 post_install() {
   usr/sbin/gconfpkg --install ${pkgname}
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+
+  echo "NOTE: You have to add your user to rfkill group because read/write"
+  echo "      access to the /dev/rfkill device is required by gnome-bluetooth"
 }
 
 pre_upgrade() {