[arch-commits] Commit in epiphany/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Friday, October 31, 2008 @ 01:03:01
  Author: eric
Revision: 17583

Merged revisions 17158,17582 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/epiphany/trunk

........
  r17158 | jgc | 2008-10-26 06:21:12 -0400 (Sun, 26 Oct 2008) | 1 line
  
  upgpkg: epiphany 2.24.1-1
........
  r17582 | eric | 2008-10-31 01:02:22 -0400 (Fri, 31 Oct 2008) | 2 lines
  
  upgpkg: epiphany 2.24.1-1
      added intltool makedepends
........

Modified:
  epiphany/repos/extra-x86_64/	(properties)
  epiphany/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


Property changes on: epiphany/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /epiphany/trunk:1-15174
   + /epiphany/trunk:1-17582

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-31 05:02:22 UTC (rev 17582)
+++ extra-x86_64/PKGBUILD	2008-10-31 05:03:01 UTC (rev 17583)
@@ -2,22 +2,22 @@
 # Maintainer: dale <dale at archlinux.org>
 
 pkgname=epiphany
-pkgver=2.24.0.1
+pkgver=2.24.1
 pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME2 web browser based on the mozilla rendering engine."
 arch=(i686 x86_64)
 license=('GPL')
-depends=('xulrunner>=1.9.0.3' 'gnome-desktop>=2.24.0' 'iso-codes>=2.0' 'desktop-file-utils' 'libxslt>=1.1.24' 'enchant>=1.4.2' 'libnotify>=0.4.4' 'libcanberra')
-makedepends=('perlxml' 'gnome-doc-utils>=0.14.0' 'gnome-python>=2.22.3' 'pkgconfig' 'libnetworkmanager>=0.6.6')
+depends=('xulrunner>=1.9.0.3' 'gnome-desktop>=2.24.1' 'iso-codes>=2.0' 'desktop-file-utils' 'libxslt>=1.1.24' 'enchant>=1.4.2' 'libnotify>=0.4.4' 'libcanberra')
+makedepends=('perlxml' 'gnome-doc-utils>=0.14.0' 'gnome-python>=2.22.3' 'pkgconfig' 'libnetworkmanager>=0.6.6' 'intltool')
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('24e284d77e782faeec219574def7f34f')
+md5sums=('3276f4ca4bef98606f84fc64ce46c9c4')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
         --localstatedir=/var \
         --enable-python \
@@ -28,9 +28,9 @@
 	--enable-network-manager \
 	--enable-spell-checker || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
-  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
-  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
 }