[arch-commits] CVS update of extra/gnome/nautilus-cd-burner (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:16:28
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/nautilus-cd-burner

Modified: PKGBUILD (1.36 -> 1.37) nautilus-cd-burner.install (1.6 -> 1.7)

upgpkg: nautilus-cd-burner 2.18.1-1
Move to /usr


----------------------------+
 PKGBUILD                   |   29 +++++++++++++----------------
 nautilus-cd-burner.install |   14 +++++++-------
 2 files changed, 20 insertions(+), 23 deletions(-)


Index: extra/gnome/nautilus-cd-burner/PKGBUILD
diff -u extra/gnome/nautilus-cd-burner/PKGBUILD:1.36 extra/gnome/nautilus-cd-burner/PKGBUILD:1.37
--- extra/gnome/nautilus-cd-burner/PKGBUILD:1.36	Mon Mar 19 18:40:05 2007
+++ extra/gnome/nautilus-cd-burner/PKGBUILD	Sun Apr 22 11:16:28 2007
@@ -1,33 +1,30 @@
-# $Id: PKGBUILD,v 1.36 2007/03/19 22:40:05 jgc Exp $
-# Maintainer: arjan <arjan at archlinux.org>
-# Contributor: Arjan Timmerman <arjan at kwando-tech.nl>
+# $Id: PKGBUILD,v 1.37 2007/04/22 15:16:28 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=nautilus-cd-burner
-pkgver=2.18.0
+pkgver=2.18.1
 pkgrel=1
 pkgdesc="adds cd burner functionality to nautilus"
 arch=(i686 x86_64)
-depends=('cdrkit' 'dvd+rw-tools' 'nautilus>=2.18.0' 'gnome-mount')
+depends=('cdrkit' 'dvd+rw-tools' 'nautilus>=2.18.1' 'gnome-mount>=0.6'
+         'desktop-file-utils')
 makedepends=('perlxml' 'pkgconfig')
 options=('nolibtool')
-license=(GPL)
+license=('GPL')
 install=nautilus-cd-burner.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/2.18/${pkgname}-${pkgver}.tar.bz2)
 groups=('gnome-extra')
-md5sums=('90b71393db1d78c7d5ab2e740f2f1678')
+md5sums=('a6b9187239551a26df7028a0b301496a')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome --enable-hal
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/nautilus-cd-burner \
+              --localstatedir=/var --enable-hal 
   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
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/
+  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/nautilus-cd-burner/nautilus-cd-burner.install
diff -u extra/gnome/nautilus-cd-burner/nautilus-cd-burner.install:1.6 extra/gnome/nautilus-cd-burner/nautilus-cd-burner.install:1.7
--- extra/gnome/nautilus-cd-burner/nautilus-cd-burner.install:1.6	Thu Feb  1 17:28:48 2007
+++ extra/gnome/nautilus-cd-burner/nautilus-cd-burner.install	Sun Apr 22 11:16:28 2007
@@ -1,9 +1,8 @@
 pkgname=nautilus-cd-burner
 
 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
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
@@ -17,19 +16,20 @@
 }
 
 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() {
   update-desktop-database -q
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }