[arch-commits] Commit in gnome-user-share/repos/extra-i686 (2 files)

[Roman Kyrylych]

    Date: Sunday, June 1, 2008 @ 11:36:04
  Author: roman
Revision: 2361

upgpkg

Modified:
  gnome-user-share/repos/extra-i686/PKGBUILD
  gnome-user-share/repos/extra-i686/gnome-user-share.install

--------------------------+
 PKGBUILD                 |   16 +++++++++-------
 gnome-user-share.install |   21 ++++++---------------
 2 files changed, 15 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-06-01 15:35:17 UTC (rev 2360)
+++ PKGBUILD	2008-06-01 15:36:04 UTC (rev 2361)
@@ -1,17 +1,19 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Roman Kyrylych <roman at archlinux.org>
+
 pkgname=gnome-user-share
-pkgver=0.11
+pkgver=0.31
 pkgrel=1
 pkgdesc="Easy to use user-level file sharing for GNOME."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
 license=('GPL')
-depends=('avahi' 'gconf>=2.18.0.1-2' 'libglade')
-makedepends=('perlxml' 'pkgconfig')
+depends=('avahi' 'dbus-glib' 'gconf>=2.18.0.1-4' 'hicolor-icon-theme')
+makedepends=('perlxml')
 install=gnome-user-share.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4961e49c858fbb7d6050c62a73286d74')
+md5sums=('81d2b3d6c0694e5669330d8ad5c8a4b0')
+options=('!emptydirs')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -20,7 +22,7 @@
               --localstatedir=/var \
               --enable-avahi --disable-howl
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
   
   mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
   gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas

Modified: gnome-user-share.install
===================================================================
--- gnome-user-share.install	2008-06-01 15:35:17 UTC (rev 2360)
+++ gnome-user-share.install	2008-06-01 15:36:04 UTC (rev 2361)
@@ -1,8 +1,8 @@
 pkgname=gnome-user-share
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
@@ -14,18 +14,9 @@
 }
 
 pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
-op=$1
-shift
-
-$op $*
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}