[arch-commits] CVS update of extra/editors/mlview (PKGBUILD mlview.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:58:01
  Author: jgc
    Path: /home/cvs-extra/extra/editors/mlview

Modified: PKGBUILD (1.12 -> 1.13) mlview.install (1.7 -> 1.8)

upgpkg: mlview 0.9.0-4
Move to /usr


----------------+
 PKGBUILD       |   27 ++++++++++++---------------
 mlview.install |   12 +++++++-----
 2 files changed, 19 insertions(+), 20 deletions(-)


Index: extra/editors/mlview/PKGBUILD
diff -u extra/editors/mlview/PKGBUILD:1.12 extra/editors/mlview/PKGBUILD:1.13
--- extra/editors/mlview/PKGBUILD:1.12	Sat Sep 30 08:12:36 2006
+++ extra/editors/mlview/PKGBUILD	Sun Apr 22 13:58:01 2007
@@ -1,41 +1,38 @@
-# $Id: PKGBUILD,v 1.12 2006/09/30 12:12:36 jgc Exp $
+# $Id: PKGBUILD,v 1.13 2007/04/22 17:58:01 jgc Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Ben <ben at benmazer.net>
 
 pkgname=mlview
 pkgver=0.9.0
-pkgrel=3
+pkgrel=4
 pkgdesc="an xml editor for gnome"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.freespiders.org/projects/gmlview/"
-depends=('libgnomeui>=2.16.0' 'gtksourceview>=1.8.0' 'libglademm>=2.6.3'
-         'vte>=0.14.0')
-makedepends=('pkgconfig' 'intltool')
+depends=('libgnomeui>=2.18.1-2' 'gtksourceview>=1.8.5-2' 'libglademm>=2.6.3' 'vte>=0.16.1-2' 'libxslt')
+makedepends=('pkgconfig' 'perlxml')
+options=('nolibtool')
 install=mlview.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/mlview/0.9/${pkgname}-${pkgver}.tar.bz2
         compilation-fixes.patch)
 md5sums=('eb3722950af8d78556b197f23870adba' 'd638075ad0aca4919f61de8061e5eed6')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -Np0 -i ${startdir}/src/compilation-fixes.patch || return 1
-  ./configure --prefix=/opt/gnome 
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   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
 
   #Desktop file tweaks
   sed -e 's|TryExec=mlv|TryExec=mlview|' \
       -e 's|/bin/mlv|/bin/mlview|' \
-      -e 's|\Icon=\(mlview-app-icon.xpm\)|Icon=/opt/gnome/share/pixmaps/\1|' \
-      -i ${startdir}/pkg/opt/gnome/share/applications/${pkgname}.desktop
+      -i ${startdir}/pkg/usr/share/applications/mlview.desktop
   echo "MimeType=text/xml;" >> \
-    ${startdir}/pkg/opt/gnome/share/applications/${pkgname}.desktop
-
-  rm -f ${startdir}/pkg/opt/gnome/lib/*.la
+    ${startdir}/pkg/usr/share/applications/mlview.desktop
 }
 # vim: ft=sh
Index: extra/editors/mlview/mlview.install
diff -u extra/editors/mlview/mlview.install:1.7 extra/editors/mlview/mlview.install:1.8
--- extra/editors/mlview/mlview.install:1.7	Sat Sep 30 08:12:36 2006
+++ extra/editors/mlview/mlview.install	Sun Apr 22 13:58:01 2007
@@ -1,8 +1,8 @@
 pkgname=mlview
 
 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
   update-desktop-database -q
 }
 
@@ -15,14 +15,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() {