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

[Jan de Groot]

    Date: Friday, December 26, 2008 @ 15:14:42
  Author: jgc
Revision: 22435

Fix conflict

Modified:
  gnome-user-share/repos/extra-i686/	(properties)
  gnome-user-share/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)


Property changes on: gnome-user-share/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnome-user-share/trunk:1
   + /gnome-user-share/trunk:1-22430

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-26 20:14:36 UTC (rev 22434)
+++ extra-i686/PKGBUILD	2008-12-26 20:14:42 UTC (rev 22435)
@@ -2,29 +2,29 @@
 # Maintainer: Roman Kyrylych <roman at archlinux.org>
 
 pkgname=gnome-user-share
-pkgver=0.31
+pkgver=0.41
 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=('GPL')
-depends=('avahi' 'dbus-glib' 'gconf>=2.18.0.1-4' 'hicolor-icon-theme')
-makedepends=('perlxml')
+depends=('avahi' 'gconf>=2.24.0' 'hicolor-icon-theme' 'apache' 'libnotify')
+makedepends=('intltool')
+options=('!emptydirs')
 install=gnome-user-share.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('81d2b3d6c0694e5669330d8ad5c8a4b0')
-options=('!emptydirs')
+md5sums=('103a8361c9efe6e20f1ae8bfb67dc175')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/gnome-user-share \
               --localstatedir=/var \
-              --enable-avahi --disable-howl
+              --enable-avahi --disable-howl || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
   
-  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
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }