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

[Jan de Groot]

    Date: Friday, December 26, 2008 @ 16:04:26
  Author: jgc
Revision: 22472

Merged revisions 356,22469 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gnome-pilot/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r22469 | jgc | 2008-12-26 21:00:41 +0000 (Fri, 26 Dec 2008) | 3 lines
  
  upgpkg: gnome-pilot 2.0.16-2
      Depend on a pilot-link that has bluez support (FS#8681)
  Remove useless desktop file (FS#12316)
........

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

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


Property changes on: gnome-pilot/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnome-pilot/trunk:1
   + /gnome-pilot/trunk:1-22471

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-26 21:01:57 UTC (rev 22471)
+++ extra-i686/PKGBUILD	2008-12-26 21:04:26 UTC (rev 22472)
@@ -3,11 +3,11 @@
 
 pkgname=gnome-pilot
 pkgver=2.0.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Pilot Support for Gnome"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gnome-panel>=2.22.0' 'pilot-link>=0.12.3')
+depends=('gnome-panel>=2.24.0' 'pilot-link>=0.12.3-3')
 makedepends=('pkgconfig' 'perlxml' 'gob2' 'gnome-doc-utils>=0.12.2')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
@@ -16,15 +16,17 @@
 md5sums=('f14e87d89902f82981f106c8df9277c9')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/gnome-pilot \
               --localstatedir=/var --disable-static \
 	      --disable-scrollkeeper || 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
+  rm -f "${pkgdir}/usr/share/applications/gpilot-applet.desktop"
+
+  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
 }