[arch-commits] CVS update of extra/gnome/gnome-user-share (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:43:13
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-user-share

Modified: PKGBUILD (1.3 -> 1.4) gnome-user-share.install (1.2 -> 1.3)

upgpkg: gnome-user-share 0.11-1
Update and move


--------------------------+
 PKGBUILD                 |   34 +++++++++++++++++-----------------
 gnome-user-share.install |   17 +++++++----------
 2 files changed, 24 insertions(+), 27 deletions(-)


Index: extra/gnome/gnome-user-share/PKGBUILD
diff -u extra/gnome/gnome-user-share/PKGBUILD:1.3 extra/gnome/gnome-user-share/PKGBUILD:1.4
--- extra/gnome/gnome-user-share/PKGBUILD:1.3	Fri Jun 30 15:25:06 2006
+++ extra/gnome/gnome-user-share/PKGBUILD	Sun Apr 22 13:43:13 2007
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD,v 1.3 2006/06/30 19:25:06 arjan Exp $
-# Maintainer: Mark Rosenstand <mark at archlinux.org>
+# $Id: PKGBUILD,v 1.4 2007/04/22 17:43:13 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=gnome-user-share
-pkgver=0.10
+pkgver=0.11
 pkgrel=1
 pkgdesc="Easy to use user-level file sharing for GNOME."
 arch=(i686 x86_64)
 url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
-license=""
-depends=('avahi' 'gconf' 'libglade' 'libsm')
-makedepends=('intltool')
-backup=('opt/gnome/share/gnome-user-share/dav_user.conf')
+license=('GPL')
+depends=('avahi' 'gconf>=2.18.0.1-2' 'libglade')
+makedepends=('perlxml' 'pkgconfig')
 install=gnome-user-share.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('f4fe38a8b9c0ba3c668a3aea450b6df6')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('4961e49c858fbb7d6050c62a73286d74')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/opt/gnome --disable-schemas-install \
-    --enable-avahi --disable-howl
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/gnome-user-share \
+              --localstatedir=/var \
+              --enable-avahi --disable-howl
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  rm ${startdir}/pkg/opt/gnome/share/gnome-user-share/dav_user.conf 
+  make DESTDIR=${startdir}/pkg install
   
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
+  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
+  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/gnome-user-share/gnome-user-share.install
diff -u extra/gnome/gnome-user-share/gnome-user-share.install:1.2 extra/gnome/gnome-user-share/gnome-user-share.install:1.3
--- extra/gnome/gnome-user-share/gnome-user-share.install:1.2	Fri Jun 30 15:25:06 2006
+++ extra/gnome/gnome-user-share/gnome-user-share.install	Sun Apr 22 13:43:13 2007
@@ -1,9 +1,8 @@
 pkgname=gnome-user-share
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
-  update-desktop-database -q
+  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
 }
 
 pre_upgrade() {
@@ -15,17 +14,15 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  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=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
-}
-
-post_remove() {
-  update-desktop-database -q
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 op=$1