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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:13:44
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gedit

Modified: PKGBUILD (1.38 -> 1.39) gedit.install (1.10 -> 1.11)

upgpkg: gedit 2.18.1-1
Move to /usr


---------------+
 PKGBUILD      |   24 +++++++++++-------------
 gedit.install |   12 +++++++-----
 2 files changed, 18 insertions(+), 18 deletions(-)


Index: extra/gnome/gedit/PKGBUILD
diff -u extra/gnome/gedit/PKGBUILD:1.38 extra/gnome/gedit/PKGBUILD:1.39
--- extra/gnome/gedit/PKGBUILD:1.38	Tue Mar 20 13:51:56 2007
+++ extra/gnome/gedit/PKGBUILD	Sun Apr 22 11:13:44 2007
@@ -1,36 +1,34 @@
-# $Id: PKGBUILD,v 1.38 2007/03/20 17:51:56 jgc Exp $
+# $Id: PKGBUILD,v 1.39 2007/04/22 15:13:44 jgc Exp $
 # Maintainer: Arjan Timmerman <arjan at archlinux.org>
 
 pkgname=gedit
-pkgver=2.18.0
+pkgver=2.18.1
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=(i686 x86_64)
-depends=('gnome-python-desktop>=2.18.0' 'libgnomeprintui>=2.18.0' 'gtksourceview>=1.8.5' 'enchant' 'libgnomeui>=2.18.1')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils')
+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')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
 groups=('gnome-extra')
 options=('nolibtool')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('faf35c2a934aff2a37a58f56c9f11e15')
+md5sums=('62def81b36befc79672ff16bc54c2d29')
 
 build() {
-  export MAKEFLAGS="-j1"
-  
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-  
   cd ${startdir}/src/${pkgname}-${pkgver}
   find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
   if [ -f omf.make ]; then
     sed -i -e 's/-scrollkeeper-update.*//' omf.make
   fi
   
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper
+  ./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/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
+  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
 }
Index: extra/gnome/gedit/gedit.install
diff -u extra/gnome/gedit/gedit.install:1.10 extra/gnome/gedit/gedit.install:1.11
--- extra/gnome/gedit/gedit.install:1.10	Sun Mar 19 07:00:51 2006
+++ extra/gnome/gedit/gedit.install	Sun Apr 22 11:13:44 2007
@@ -1,8 +1,8 @@
 pkgname=gedit
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  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
   update-desktop-database -q
 }
@@ -16,14 +16,16 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  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=`opt/gnome/bin/gconftool-2 --get-default-source`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {