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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:56:47
  Author: jgc
    Path: /home/cvs-extra/extra/editors/conglomerate

Modified: PKGBUILD (1.10 -> 1.11) conglomerate.install (1.4 -> 1.5)

upgpkg: conglomerate 0.9.1-3
Move to /usr


----------------------+
 PKGBUILD             |   30 ++++++++++++++++++------------
 conglomerate.install |   40 ++++++++++++++--------------------------
 2 files changed, 32 insertions(+), 38 deletions(-)


Index: extra/editors/conglomerate/PKGBUILD
diff -u extra/editors/conglomerate/PKGBUILD:1.10 extra/editors/conglomerate/PKGBUILD:1.11
--- extra/editors/conglomerate/PKGBUILD:1.10	Sat May 20 18:37:03 2006
+++ extra/editors/conglomerate/PKGBUILD	Sun Apr 22 13:56:47 2007
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD,v 1.10 2006/05/20 22:37:03 uid1016 Exp $
+# $Id: PKGBUILD,v 1.11 2007/04/22 17:56:47 jgc Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: J. Santiago Hirschfeld <jsantiagoh at yahoo.com.ar>
 
 pkgname=conglomerate
 pkgver=0.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc="XML Docbook editor"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.conglomerate.org"
-depends=('libgnomeui' 'gtksourceview' 'enchant')
+depends=('libgnomeui>=2.18.1-2' 'gtksourceview>=1.8.5-2' 'enchant' 'desktop-file-utils' 'scrollkeeper' 'libxslt')
 makedepends=('gtk-doc' 'docbook-xsl')
-install=$pkgname.install
-source=("http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+install=conglomerate.install
+source=("http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('49ad67492e947d6c15e5b875d8360890')
 
 build() {
-  [ -f /etc/profile.d/gnome.sh ] && . /etc/profile.d/gnome.sh
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/opt/gnome --disable-schemas-install --disable-gtk-doc
+  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=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  sed -i 's|\Icon=\(.*\)$|Icon=/opt/gnome/share/pixmaps/\1|' \
-        $startdir/pkg/opt/gnome/share/applications/$pkgname.desktop
-	
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+   
+  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
 }
 # vim: ft=sh
Index: extra/editors/conglomerate/conglomerate.install
diff -u extra/editors/conglomerate/conglomerate.install:1.4 extra/editors/conglomerate/conglomerate.install:1.5
--- extra/editors/conglomerate/conglomerate.install:1.4	Tue Jul  5 16:17:14 2005
+++ extra/editors/conglomerate/conglomerate.install	Sun Apr 22 13:56:47 2007
@@ -1,19 +1,9 @@
 pkgname=conglomerate
 
 post_install() {
-  schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`)
-
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  for schema in "${schemas[@]}" ; do
-    opt/gnome/bin/gconftool-2 --makefile-install-rule "$schema" >/dev/null 2>&1
-  done
-
-  for scroll in "${scrolls[@]}" ; do
-    scrollkeeper-install -q -p var/lib/scrollkeeper "$scroll"
-  done
-
-  kill -s HUP `pidof /opt/gnome/bin/gconfd-2` > /dev/null 2>&1
+  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
 }
 
@@ -26,23 +16,21 @@
 }
 
 pre_remove() {
-  schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`)
-
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  for schema in "${schemas[@]}" ; do
-    opt/gnome/bin/gconftool-2 --makefile-uninstall-rule "$schema" >/dev/null 2>&1
-  done
-
-  for scroll in "${scrolls[@]}" ; do
-    scrollkeeper-uninstall -q -p var/lib/scrollkeeper "$scroll"
-  done
-
-  kill -s HUP `pidof /opt/gnome/bin/gconfd-2` >/dev/null 2>&1
+  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
 }
 
 post_remove() {
   update-desktop-database -q
+  scrollkeeper-update -q -p var/lib/scrollkeeper
 }
 
 op=$1