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

[Ionut Biru]

    Date: Monday, September 27, 2010 @ 08:26:55
  Author: ibiru
Revision: 91568

upgpkg: gnome-bluetooth 2.31.90-1
update to 2.31.90

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

-------------------------+
 PKGBUILD                |   22 +++++++++-------------
 gnome-bluetooth.install |   15 ++-------------
 2 files changed, 11 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-27 12:23:30 UTC (rev 91567)
+++ PKGBUILD	2010-09-27 12:26:55 UTC (rev 91568)
@@ -3,21 +3,21 @@
 # Contributor: Roman Kyrylych <roman at archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=2.30.0
-pkgrel=3
+pkgver=2.31.90
+pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeBluetooth"
 license=('GPL' 'LGPL')
-depends=('libunique>=1.1.6' 'libnotify>=0.4.5' 'gconf>=2.28.1' 'hicolor-icon-theme' 'gvfs-obexftp>=1.6.3' 'obexd-client>=0.29')
-makedepends=('intltool' 'pygtk>=2.17' 'gnome-doc-utils>=0.20.1' 'nautilus-sendto>=2.28.4' 'gobject-introspection>=0.6.14' 'gir-repository')
+depends=('libunique>=1.1.6' 'libnotify>=0.4.5' 'hicolor-icon-theme' 'gvfs-obexftp>=1.6.3' 'obexd-client>=0.33')
+makedepends=('intltool' 'pygtk>=2.22' 'gnome-doc-utils>=0.20.1' 'nautilus-sendto>=2.28.4' 'gobject-introspection>=0.9.6')
 replaces=('bluez-gnome')
 conflicts=('bluez-gnome')
 options=('!libtool' '!emptydirs' '!makeflags')
 install=gnome-bluetooth.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.31/${pkgname}-${pkgver}.tar.bz2
         61-gnome-bluetooth-rfkill.rules)
-sha256sums=('4caafa8c28195c81d8c51414f3a64489f81b9b46cac56979aeaaff8c9ebb78d4'
+sha256sums=('f5dec899c9fd425972074308fdd6287376bd7087a33101fe0644fa82c10076dc'
             'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,19 +25,15 @@
     --sysconfdir=/etc \
     --localstatedir=/var \
     --disable-desktop-update \
-    --disable-icon-update
+    --disable-icon-update \
+    --disable-schemas-compile
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  make 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
-
   install -m644 -D "${srcdir}/61-gnome-bluetooth-rfkill.rules" \
                      "${pkgdir}/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules"
 }

Modified: gnome-bluetooth.install
===================================================================
--- gnome-bluetooth.install	2010-09-27 12:23:30 UTC (rev 91567)
+++ gnome-bluetooth.install	2010-09-27 12:26:55 UTC (rev 91568)
@@ -1,24 +1,13 @@
-pkgname=gnome-bluetooth
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
-pre_upgrade() {
-  pre_remove $1
-}
-
 post_upgrade() {
   post_install $1
 }
 
-pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-  fi
-}
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install $1
 }