Date: Saturday, February 26, 2011 @ 14:03:13 Author: ibiru Revision: 111431
upgpkg: gnome-screensaver 2.91.90-1 update to 2.91.90 Modified: gnome-screensaver/trunk/PKGBUILD gnome-screensaver/trunk/gnome-screensaver.install ---------------------------+ PKGBUILD | 18 +++++++++--------- gnome-screensaver.install | 16 +++------------- 2 files changed, 12 insertions(+), 22 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-02-26 18:42:54 UTC (rev 111430) +++ PKGBUILD 2011-02-26 19:03:13 UTC (rev 111431) @@ -2,22 +2,22 @@ # Maintainer: Jan de Groot <j...@archlinux.org> pkgname=gnome-screensaver -pkgver=2.30.2 +pkgver=2.91.90 pkgrel=1 pkgdesc="Screensaver designed to integrate well with the GNOME desktop." arch=('i686' 'x86_64') license=('GPL') url="http://live.gnome.org/GnomeScreensaver" backup=(etc/pam.d/gnome-screensaver) -depends=('gnome-menus>=2.30.4' 'libgnomekbd>=2.32.0' 'libgl' 'libnotify>=0.4.5' 'gnome-desktop>=2.32.0') +depends=('dbus-glib' 'gnome-menus' 'libgnomekbd' 'libgl' 'gnome-desktop' 'gsettings-desktop-schemas') makedepends=('pkgconfig' 'intltool' 'mesa' 'xscreensaver' 'libxss' 'libxslt') optdepends=('xscreensaver') groups=('gnome') options=(!emptydirs) install=gnome-screensaver.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2 - gnome-screensaver.pam) -sha256sums=('dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa' +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2 + gnome-screensaver.pam) +sha256sums=('af65f01f831723ade18650caaa75dd1b1ee4391148f2c63fd061cf451f63bd99' '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2') @@ -31,6 +31,10 @@ --with-mit-ext make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver" @@ -41,8 +45,4 @@ cd "${pkgdir}/usr/share/applications/screensavers" "${srcdir}/${pkgname}-${pkgver}/data/migrate-xscreensaver-config.sh" \ /usr/share/xscreensaver/config/*.xml - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-screensaver ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } Modified: gnome-screensaver.install =================================================================== --- gnome-screensaver.install 2011-02-26 18:42:54 UTC (rev 111430) +++ gnome-screensaver.install 2011-02-26 19:03:13 UTC (rev 111431) @@ -1,17 +1,7 @@ pkgname=gnome-screensaver -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - pre_upgrade() { - pre_remove $1 + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi } - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -}