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

[Jan de Groot]

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

Modified: PKGBUILD (1.19 -> 1.20) screem.install (1.6 -> 1.7)

upgpkg: screem 0.16.1-5
Move to /usr


----------------+
 PKGBUILD       |   18 +++++++++---------
 screem.install |   12 +++++++-----
 2 files changed, 16 insertions(+), 14 deletions(-)


Index: extra/editors/screem/PKGBUILD
diff -u extra/editors/screem/PKGBUILD:1.19 extra/editors/screem/PKGBUILD:1.20
--- extra/editors/screem/PKGBUILD:1.19	Sat Mar 24 12:53:08 2007
+++ extra/editors/screem/PKGBUILD	Sun Apr 22 13:58:54 2007
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD,v 1.19 2007/03/24 16:53:08 jgc Exp $
+# $Id: PKGBUILD,v 1.20 2007/04/22 17:58:54 jgc Exp $
 # Maintainer: Roberto Carvajal <roberto at archlinux.org>
 # Contributor: Kritoke <typeolinux at yahoo.com>
 
 pkgname=screem
 pkgver=0.16.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A source oriented web site development environment for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.screem.org"
-depends=('gtksourceview>=1.8.5' 'libgtkhtml' 'libgnomeui>=2.18.1' 'libcroco'
+depends=('gtksourceview>=1.8.5-2' 'libgtkhtml>=2.11.0' 'libgnomeui>=2.18.1-2' 'libcroco'
          'libgnomeprintui>=2.18.0' 'startup-notification>=0.9' 'enchant'
-	 'gnome-menus>=2.18.0')
+	 'gnome-menus>=2.18.0-2' 'scrollkeeper' 'desktop-file-utils')
 makedepends=('perlxml' 'pkgconfig')
 options=('nolibtool')
 install=screem.install
@@ -22,7 +22,6 @@
 	 '2a26231fbab056165d84bad03dfb3edd')
 
 build() {
-  [ -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
@@ -37,7 +36,8 @@
       -e 's/-DGTK_DISABLE_DEPRECATED//g' \
       -i configure
 
-  ./configure --prefix=/opt/gnome \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+        --localstatedir=/var \
 	--with-ssl --with-included-neon \
 	--disable-update-mime \
 	--disable-update-desktop \
@@ -46,7 +46,7 @@
   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/editors/screem/screem.install
diff -u extra/editors/screem/screem.install:1.6 extra/editors/screem/screem.install:1.7
--- extra/editors/screem/screem.install:1.6	Sat Jul  8 14:41:59 2006
+++ extra/editors/screem/screem.install	Sun Apr 22 13:58:54 2007
@@ -1,8 +1,8 @@
 pkgname=screem
 
 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
   update-mime-database opt/gnome/share/mime > /dev/null
@@ -17,14 +17,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() {