[arch-commits] CVS update of extra/gnome/gedit (PKGBUILD gedit.install)

[Jan de Groot]

    Date: Saturday, July 7, 2007 @ 05:48:59
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gedit

Modified: PKGBUILD (1.39 -> 1.40) gedit.install (1.11 -> 1.12)

upgpkg: gedit 2.18.2-1
Add workaround for bug in the makefiles,
migrate to gconfpkg
add iso-codes to dependencies


---------------+
 PKGBUILD      |   15 +++++++++------
 gedit.install |   14 ++------------
 2 files changed, 11 insertions(+), 18 deletions(-)


Index: extra/gnome/gedit/PKGBUILD
diff -u extra/gnome/gedit/PKGBUILD:1.39 extra/gnome/gedit/PKGBUILD:1.40
--- extra/gnome/gedit/PKGBUILD:1.39	Sun Apr 22 11:13:44 2007
+++ extra/gnome/gedit/PKGBUILD	Sat Jul  7 05:48:58 2007
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD,v 1.39 2007/04/22 15:13:44 jgc Exp $
+# $Id: PKGBUILD,v 1.40 2007/07/07 09:48:58 jgc Exp $
 # Maintainer: Arjan Timmerman <arjan at archlinux.org>
 
 pkgname=gedit
-pkgver=2.18.1
+pkgver=2.18.2
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gnome-python-desktop>=2.18.0' 'libgnomeprintui>=2.18.0' 'gtksourceview>=1.8.5-2' 'enchant' 'libgnomeui>=2.18.1-2' 'scrollkeeper' 'desktop-file-utils')
+depends=('gnome-python-desktop>=2.18.0' 'libgnomeprintui>=2.18.0' 'gtksourceview>=1.8.5-2' 'enchant' 'libgnomeui>=2.18.1-2' 'scrollkeeper' 'desktop-file-utils' 'gconf>=2.18.0.1-4' 'iso-codes')
 makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
 groups=('gnome-extra')
-options=('nolibtool')
+options=('!libtool')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('62def81b36befc79672ff16bc54c2d29')
+md5sums=('7e8bf29bd6bf0d17ceaf42d9bd5d94e6')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -26,7 +26,10 @@
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-scrollkeeper
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+
+  mkdir -p ${startdir}/pkg/usr/bin
+  touch ${startdir}/pkg/usr/bin/gedit
+  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
Index: extra/gnome/gedit/gedit.install
diff -u extra/gnome/gedit/gedit.install:1.11 extra/gnome/gedit/gedit.install:1.12
--- extra/gnome/gedit/gedit.install:1.11	Sun Apr 22 11:13:44 2007
+++ extra/gnome/gedit/gedit.install	Sat Jul  7 05:48:58 2007
@@ -1,8 +1,7 @@
 pkgname=gedit
 
 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
+  usr/sbin/gconfpkg --install ${pkgname}
   scrollkeeper-update -q -p var/lib/scrollkeeper
   update-desktop-database -q
 }
@@ -16,16 +15,7 @@
 }
 
 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() {