[arch-commits] CVS update of extra/gnome/gnome-session (3 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:22:33
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-session

Modified: PKGBUILD (1.34 -> 1.35) gnome-session.install (1.7 -> 1.8)
          gnome.desktop (1.4 -> 1.5)

upgpkg: gnome-session 2.18.0-3
Move to /usr


-----------------------+
 PKGBUILD              |   27 +++++++++++++--------------
 gnome-session.install |   14 +++++++-------
 gnome.desktop         |    4 ++--
 3 files changed, 22 insertions(+), 23 deletions(-)


Index: extra/gnome/gnome-session/PKGBUILD
diff -u extra/gnome/gnome-session/PKGBUILD:1.34 extra/gnome/gnome-session/PKGBUILD:1.35
--- extra/gnome/gnome-session/PKGBUILD:1.34	Sat Mar 24 18:38:05 2007
+++ extra/gnome/gnome-session/PKGBUILD	Sun Apr 22 12:22:33 2007
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD,v 1.34 2007/03/24 22:38:05 jgc Exp $
-# Maintainer: arjan <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.35 2007/04/22 16:22:33 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-session
 pkgver=2.18.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
-depends=('tcp_wrappers' 'gnome-desktop>=2.18.0')
-makedepends=('perlxml' 'pkgconfig' 'control-center>=2.18.0')
+license=('GPL' 'LGPL')
+depends=('tcp_wrappers' 'gnome-desktop>=2.18.1')
+makedepends=('perlxml' 'pkgconfig' 'control-center>=2.18.1')
 install=gnome-session.install
 url="http://www.gnome.org"
 groups=('gnome')
@@ -15,23 +16,21 @@
 	gsm-dbus.patch
 	gnome.desktop)
 md5sums=('830dbabe74474da49018889d27eefaae' '80f38a9a76938d08e6437fea24c841b3'
-	 '244c335f55f95215ff5746a3fef31234')
+	 '152cddde06e16f16641746467f7ff965')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -Np1 -i ${startdir}/src/gsm-dbus.patch || return 1
-  ./configure --prefix=/opt/gnome \
-	--with-reboot-command=reboot --with-halt-command=halt \
-	--with-rsh-command=ssh
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+	      --with-reboot-command=reboot --with-halt-command=halt \
+	      --with-rsh-command=ssh
 
   make || return 1
   make DESTDIR=${startdir}/pkg GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
   install -d -m755 ${startdir}/pkg/etc/X11/sessions
   install -m644 ${startdir}/src/gnome.desktop ${startdir}/pkg/etc/X11/sessions/gnome.desktop
 
-  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/gnome-session/gnome-session.install
diff -u extra/gnome/gnome-session/gnome-session.install:1.7 extra/gnome/gnome-session/gnome-session.install:1.8
--- extra/gnome/gnome-session/gnome-session.install:1.7	Tue Feb 13 03:43:21 2007
+++ extra/gnome/gnome-session/gnome-session.install	Sun Apr 22 12:22:33 2007
@@ -1,9 +1,8 @@
 pkgname=gnome-session
 
 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
-  update-desktop-database -q
+  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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -16,18 +15,19 @@
 }
 
 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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
Index: extra/gnome/gnome-session/gnome.desktop
diff -u extra/gnome/gnome-session/gnome.desktop:1.4 extra/gnome/gnome-session/gnome.desktop:1.5
--- extra/gnome/gnome-session/gnome.desktop:1.4	Fri Oct  6 16:18:46 2006
+++ extra/gnome/gnome-session/gnome.desktop	Sun Apr 22 12:22:33 2007
@@ -119,8 +119,8 @@
 Comment[vi]=Phiên là m việc nà y đăng nhập bạn và o GNOME
 Comment[zh_CN]=此会话使您登录到 GNOME
 Comment[zh_TW]=選取這個作業階段後會進入 GNOME 環境
-Exec=/opt/gnome/bin/gnome-session
-TryExec=/opt/gnome/bin/gnome-session
+Exec=/usr/bin/gnome-session
+TryExec=/usr/bin/gnome-session
 # no icon yet, only the top three are currently used
 Icon=
 Type=Application