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

[Jan de Groot]

    Date: Tuesday, August 24, 2010 @ 10:31:20
  Author: jgc
Revision: 88707

upgpkg: gnome-screensaver 2.30.0-2
Get rid of libxxf86misc dependency

Modified:
  gnome-screensaver/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-08-24 14:27:38 UTC (rev 88706)
+++ PKGBUILD    2010-08-24 14:31:20 UTC (rev 88707)
@@ -3,13 +3,13 @@
 
 pkgname=gnome-screensaver
 pkgver=2.30.0
-pkgrel=1
+pkgrel=2
 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.0' 'libgnomekbd>=2.30.0' 'libgl' 
'libnotify>=0.4.5' 'gnome-desktop>=2.30.0' 'libxxf86misc')
+depends=('gnome-menus>=2.30.0' 'libgnomekbd>=2.30.0' 'libgl' 
'libnotify>=0.4.5' 'gnome-desktop>=2.30.0')
 makedepends=('pkgconfig' 'intltool' 'mesa' 'xscreensaver' 'libxss' 'libxslt')
 optdepends=('xscreensaver')
 groups=('gnome')
@@ -26,20 +26,20 @@
       --libexecdir=/usr/lib/gnome-screensaver \
       --localstatedir=/var \
       --with-xscreensaverdir=/usr/share/xscreensaver/config \
-      --with-xscreensaverhackdir=/usr/lib/xscreensaver || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+      --with-xscreensaverhackdir=/usr/lib/xscreensaver
+  make
+  make DESTDIR="${pkgdir}" install
 
-  install -m644 "${srcdir}/gnome-screensaver.pam" 
"${pkgdir}/etc/pam.d/gnome-screensaver" || return 1
+  install -m644 "${srcdir}/gnome-screensaver.pam" 
"${pkgdir}/etc/pam.d/gnome-screensaver"
 
   #Migrate xscreensaver configuration files
   sed -e 's|Exec=|Exec=/usr/lib/xscreensaver/|' \
-      -i data/xscreensaver-config.xsl || return 1
+      -i data/xscreensaver-config.xsl
   cd "${pkgdir}/usr/share/applications/screensavers"
   "${srcdir}/${pkgname}-${pkgver}/data/migrate-xscreensaver-config.sh" \
-      /usr/share/xscreensaver/config/*.xml || return 1
+      /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 || return 1
+  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
 }