[arch-commits] Commit in gnome-screensaver/trunk (PKGBUILD)

[Jan de Groot]

    Date: Thursday, March 19, 2009 @ 18:38:41
  Author: jgc
Revision: 30453

upgpkg: gnome-screensaver 2.26.0-1
    GNOME 2.26

Modified:
  gnome-screensaver/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-19 22:31:12 UTC (rev 30452)
+++ PKGBUILD	2009-03-19 22:38:41 UTC (rev 30453)
@@ -2,28 +2,25 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-screensaver
-pkgver=2.24.1
-pkgrel=2
+pkgver=2.26.0
+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.24.2' 'libgnomekbd>=2.24.0' 'libxss' 'libgl' 'libnotify' 'gnome-desktop>=2.24.2' 'libxxf86misc')
+depends=('gnome-menus>=2.26.0' 'libgnomekbd>=2.26.0' 'libxss' 'libgl' 'libnotify' 'gnome-desktop>=2.26.0' 'libxxf86misc')
 makedepends=('pkgconfig' 'gettext' 'intltool' 'mesa' 'xscreensaver')
 groups=('gnome')
 options=(!emptydirs)
 install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2
-	gnome-screensaver.pam
-	bug564548.patch)
-md5sums=('f0b9cc3108bb9105141a8c22b56bf615'
-         '4b4d2672a787e0d2ed792b4c308ccf8d'
-	 'b2accd56fd1e7e3855c1cee3cc3780c4')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2
+	gnome-screensaver.pam)
+md5sums=('f9c5144defc80991b18c653c029001d6'
+         '4b4d2672a787e0d2ed792b4c308ccf8d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/bug564548.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/gnome-screensaver \
               --localstatedir=/var --with-gdm-config=/usr/share/gdm/defaults.conf \
@@ -40,6 +37,6 @@
   "${srcdir}/${pkgname}-${pkgver}/data/migrate-xscreensaver-config.sh" /usr/share/xscreensaver/config/*.xml || return 1
   
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-screensaver ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }