Date: Monday, March 21, 2011 @ 10:24:27 Author: heftig Revision: 115784
upgpkg: gnome-session 2.91.91.3-3 Remove unnecessary gconf schema stuff Modified: gnome-session/trunk/PKGBUILD gnome-session/trunk/gnome-session.install -----------------------+ PKGBUILD | 13 +++++-------- gnome-session.install | 16 +++++----------- 2 files changed, 10 insertions(+), 19 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-03-21 14:11:14 UTC (rev 115783) +++ PKGBUILD 2011-03-21 14:24:27 UTC (rev 115784) @@ -3,11 +3,13 @@ pkgname=gnome-session pkgver=2.91.91.3 -pkgrel=2 +pkgrel=3 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) license=('GPL' 'LGPL') -depends=('upower' 'gtk3' 'gconf' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'librsvg' 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf') +depends=('upower' 'gtk3' 'gconf' 'startup-notification' 'hicolor-icon-theme' + 'libxtst' 'polkit-gnome' 'libgl' 'librsvg' 'gsettings-desktop-schemas' + 'consolekit' 'libsm' 'dconf') makedepends=('intltool' 'mesa' 'xtrans') options=('!emptydirs') install=gnome-session.install @@ -26,10 +28,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install - - install -d -m755 "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-session-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + make DESTDIR="${pkgdir}" install } Modified: gnome-session.install =================================================================== --- gnome-session.install 2011-03-21 14:11:14 UTC (rev 115783) +++ gnome-session.install 2011-03-21 14:24:27 UTC (rev 115784) @@ -1,24 +1,18 @@ -pkgname=gnome-session - post_install() { - usr/sbin/gconfpkg --install ${pkgname} usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } pre_upgrade() { - pre_remove $1 + if (( $(vercmp $2 2.91.91.3-3) < 0 )); then + usr/sbin/gconfpkg --uninstall gnome-session + fi } post_upgrade() { - post_install $1 + post_install } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install }