[arch-commits] Commit in system-config-printer/trunk (PKGBUILD)

[Andrea Scarpino]

    Date: Monday, June 21, 2010 @ 09:02:36
  Author: andrea
Revision: 83395

upgpkg: system-config-printer 1.2.2-1
upstream release

Modified:
  system-config-printer/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-21 12:59:10 UTC (rev 83394)
+++ PKGBUILD	2010-06-21 13:02:36 UTC (rev 83395)
@@ -4,7 +4,7 @@
 pkgbase=system-config-printer
 pkgname=('system-config-printer-common'
 	'system-config-printer-gnome')
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
@@ -12,7 +12,7 @@
 license=('GPL')
 makedepends=('intltool' 'python' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
 source=("http://cyberelk.net/tim/data/${pkgbase}/1.2/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('d4ac2e49263ac1edb83ddc19ae4dc759')
+md5sums=('c3bbaf5282535e2332fe5072a72814cc')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -21,7 +21,7 @@
     --sbindir=/usr/bin \
     --sysconfdir=/etc \
     --disable-nls
-  make || return 1
+  make
 }
 
 package_system-config-printer-common() {
@@ -46,18 +46,18 @@
     smburi.py \
     statereason.py \
     XmlHelper.py \
-    ${pkgdir}/usr/share/${pkgbase}/ || return 1
+    ${pkgdir}/usr/share/${pkgbase}/
 
   install -m755 pysmb.py \
-    ${pkgdir}/usr/share/${pkgbase}/ || return 1
+    ${pkgdir}/usr/share/${pkgbase}/
 
   install -d ${pkgdir}/etc/dbus-1/system.d/
   install -m644 newprinternotification.conf \
-    ${pkgdir}/etc/dbus-1/system.d/ || return 1
+    ${pkgdir}/etc/dbus-1/system.d/
 
   for file in build/lib/cupshelpers/*.py; do
     install -Dm644 $file \
-      ${pkgdir}/usr/lib/python2.6/site-packages/cupshelpers/$(basename $file) || return 1
+      ${pkgdir}/usr/lib/python2.6/site-packages/cupshelpers/$(basename $file)
   done
 }
 
@@ -66,7 +66,8 @@
   depends=('system-config-printer-common' 'gnome-python' 'gnome-icon-theme' 'pygobject' 'pygtk' 'libxml2' 'python-notify')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
+
   cd ${pkgdir}/usr/share/${pkgbase}
   rm config.py \
     debug.py \
@@ -79,7 +80,7 @@
     smburi.py \
     statereason.py \
     XmlHelper.py \
-    pysmb.py || return 1
-  rm ${pkgdir}/etc/dbus-1/system.d/newprinternotification.conf || return 1
-  rm -r ${pkgdir}/usr/lib/python2.6/site-packages/cupshelpers/ || return 1
+    pysmb.py
+  rm ${pkgdir}/etc/dbus-1/system.d/newprinternotification.conf
+  rm -r ${pkgdir}/usr/lib/python2.6/site-packages/cupshelpers/
 }