[arch-commits] Commit in gnome-bluetooth/repos (3 files)

[Jan de Groot]

    Date: Sunday, October 11, 2009 @ 15:52:57
  Author: jgc
Revision: 54854

Merged revisions 54852 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gnome-bluetooth/trunk

........
  r54852 | jgc | 2009-10-11 21:52:35 +0200 (Sun, 11 Oct 2009) | 1 line
  
  Merge gnome-unstable
........

Modified:
  gnome-bluetooth/repos/extra-x86_64/	(properties)
  gnome-bluetooth/repos/extra-x86_64/PKGBUILD
  gnome-bluetooth/repos/extra-x86_64/gnome-bluetooth.install

-------------------------+
 PKGBUILD                |   30 ++++++++++++++++--------------
 gnome-bluetooth.install |   23 +++++++++++++++++++++--
 2 files changed, 37 insertions(+), 16 deletions(-)


Property changes on: gnome-bluetooth/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnome-bluetooth/trunk:1-33018
   + /gnome-bluetooth/trunk:1-54853

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-11 19:52:40 UTC (rev 54853)
+++ extra-x86_64/PKGBUILD	2009-10-11 19:52:57 UTC (rev 54854)
@@ -2,27 +2,29 @@
 # Maintainer: Roman Kyrylych <roman at archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=0.12.0
+pkgver=2.28.1
 pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem."
 arch=('i686' 'x86_64')
-url="http://www.usefulinc.com/software/gnome-bluetooth/"
+url="http://live.gnome.org/GnomeBluetooth"
 license=('GPL' 'LGPL')
-depends=('libbtctl>=0.10.0' 'libgnomeui>=2.24.1')
-makedepends=('gob2' 'intltool' 'pygtk>=2.14.1')
-options=('!libtool')
+depends=('bluez>=4.39' 'libunique>=1.1.2' 'libnotify>=0.4.5' 'gconf>=2.28.0' 'hicolor-icon-theme' 'gvfs>=1.4.0' 'obexd>=0.17')
+makedepends=('intltool' 'pygtk>=2.16.0' 'gnome-doc-utils>=0.18.0')
+replaces=('bluez-gnome')
+conflicts=('bluez-gnome')
+options=('!libtool' '!emptydirs' '!makeflags')
 install=gnome-bluetooth.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/0.12/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('881a01ce964b8c02b5d40be8b5aedcaf')
+source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/2.28/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('17516d4004984f43a26c8fcb763d045b045a2d02ebf843536db3af74ff90c569')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  aclocal || return 1
-  automake || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  sed -e 's|^pythondir = /usr|pythondir = |' \
-      -e 's|^pydir = /usr|pydir = |' \
-      -i src/Makefile || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-desktop-update --disable-icon-update || return 1
   make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+
+  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
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Modified: extra-x86_64/gnome-bluetooth.install
===================================================================
--- extra-x86_64/gnome-bluetooth.install	2009-10-11 19:52:40 UTC (rev 54853)
+++ extra-x86_64/gnome-bluetooth.install	2009-10-11 19:52:57 UTC (rev 54854)
@@ -1,5 +1,24 @@
+pkgname=gnome-bluetooth
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
 pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/gnome-bluetooth.schemas ]; then
-    usr/sbin/gconfpkg --uninstall gnome-bluetooth
+  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
+}