[arch-commits] CVS update of extra/gnome/gnome-pilot (3 files)

[Jan de Groot]

    Date: Wednesday, March 12, 2008 @ 19:41:11
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-pilot

Modified: PKGBUILD (1.17 -> 1.18) gnome-pilot.install (1.6 -> 1.7)
 Removed: pkgconfig.patch (1.1)

upgpkg: gnome-pilot 2.0.16-1


---------------------+
 PKGBUILD            |   28 ++++++++++++----------------
 gnome-pilot.install |   24 ++----------------------
 pkgconfig.patch     |   33 ---------------------------------
 3 files changed, 14 insertions(+), 71 deletions(-)


Index: extra/gnome/gnome-pilot/PKGBUILD
diff -u extra/gnome/gnome-pilot/PKGBUILD:1.17 extra/gnome/gnome-pilot/PKGBUILD:1.18
--- extra/gnome/gnome-pilot/PKGBUILD:1.17	Mon Dec 10 22:20:29 2007
+++ extra/gnome/gnome-pilot/PKGBUILD	Wed Mar 12 19:41:11 2008
@@ -1,34 +1,30 @@
-# $Id: PKGBUILD,v 1.17 2007/12/11 03:20:29 kevin Exp $
+# $Id: PKGBUILD,v 1.18 2008/03/12 23:41:11 jgc Exp $
 # Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-pilot
-pkgver=2.0.15
-pkgrel=3
+pkgver=2.0.16
+pkgrel=1
 pkgdesc="Pilot Support for Gnome"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gnome-panel>=2.18.1' 'pilot-link>=0.12.3' 'scrollkeeper')
-makedepends=('pkgconfig' 'perlxml' 'gob2')
-options=('!libtool')
+depends=('gnome-panel>=2.22.0' 'pilot-link>=0.12.3')
+makedepends=('pkgconfig' 'perlxml' 'gob2' 'gnome-doc-utils>=0.12.2')
+options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-pilot.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('460a1fdd2206e1bbf820639831ca88f8')
+md5sums=('f14e87d89902f82981f106c8df9277c9')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  if [ -f omf.make ]; then
-    find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
-    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  fi
-
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/gnome-pilot \
-              --localstatedir=/var --disable-static
+              --localstatedir=/var --disable-static \
+	      --disable-scrollkeeper || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg 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
+  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
 }
Index: extra/gnome/gnome-pilot/gnome-pilot.install
diff -u extra/gnome/gnome-pilot/gnome-pilot.install:1.6 extra/gnome/gnome-pilot/gnome-pilot.install:1.7
--- extra/gnome/gnome-pilot/gnome-pilot.install:1.6	Sun Apr 22 11:38:07 2007
+++ extra/gnome/gnome-pilot/gnome-pilot.install	Wed Mar 12 19:41:11 2008
@@ -1,9 +1,7 @@
 pkgname=gnome-pilot
 
 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
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  usr/sbin/gconfpkg --install ${pkgname}
 }
 
 pre_upgrade() {
@@ -15,23 +13,5 @@
 }
 
 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}
 }
-
-post_remove() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
-}
-
-op=$1
-shift
-
-$op $*
Index: extra/gnome/gnome-pilot/pkgconfig.patch
diff -u extra/gnome/gnome-pilot/pkgconfig.patch:1.1 extra/gnome/gnome-pilot/pkgconfig.patch:removed
--- extra/gnome/gnome-pilot/pkgconfig.patch:1.1	Thu Jun  2 06:25:06 2005
+++ extra/gnome/gnome-pilot/pkgconfig.patch	Wed Mar 12 19:41:11 2008
@@ -1,33 +0,0 @@
---- gpilotd/Makefile.in.orig	Thu Apr 21 20:56:17 2005
-+++ gpilotd/Makefile.in	Thu Apr 21 21:00:38 2005
-@@ -70,7 +70,7 @@
- 	"$(DESTDIR)$(libgpilotdincludedir)"
- gpilotdlibsLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(gpilotdlibs_LTLIBRARIES)
--libgpilotd_la_LIBADD =
-+libgpilotd_la_LIBADD = $(GNOME_PILOT_LIBS)
- am__objects_1 =
- am__objects_2 = gnome-pilot-common.lo gnome-pilot-skels.lo \
- 	gnome-pilot-stubs.lo $(am__objects_1)
-@@ -78,7 +78,7 @@
- am_libgpilotd_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
- 	$(am__objects_1)
- libgpilotd_la_OBJECTS = $(am_libgpilotd_la_OBJECTS)
--libgpilotdconduit_la_LIBADD =
-+libgpilotdconduit_la_LIBADD = $(GNOME_PILOT_LIBS)
- am__objects_4 = gnome-pilot-conduit.lo gnome-pilot-conduit-file.lo \
- 	gnome-pilot-conduit-backup.lo gnome-pilot-conduit-standard.lo \
- 	$(am__objects_1)
-
---- libgpilotdCM/Makefile.in.orig	Thu Apr 21 23:51:24 2005
-+++ libgpilotdCM/Makefile.in	Thu Apr 21 23:51:39 2005
-@@ -60,7 +60,7 @@
- 	"$(DESTDIR)$(libgpilotdcmincludedir)"
- gpilotdcmlibsLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(gpilotdcmlibs_LTLIBRARIES)
--libgpilotdcm_la_LIBADD =
-+libgpilotdcm_la_LIBADD = $(GNOME_PILOT_LIBS)
- am__objects_1 = gnome-pilot-conduit-management.lo \
- 	gnome-pilot-conduit-config.lo
- am_libgpilotdcm_la_OBJECTS = $(am__objects_1)
-