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

[Stéphane Gaudreault]

    Date: Wednesday, February 9, 2011 @ 13:22:15
  Author: stephane
Revision: 109452

upgpkg: rfkill 0.4-2
Rebuild of old package, Tidy up PKGBUILD

Modified:
  rfkill/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-09 17:53:42 UTC (rev 109451)
+++ PKGBUILD	2011-02-09 18:22:15 UTC (rev 109452)
@@ -4,8 +4,8 @@
 
 pkgname=rfkill
 pkgver=0.4
-pkgrel=1
-pkgdesc="Tool to query and set the rfkill state of wireless devices"
+pkgrel=2
+pkgdesc="A tool for enabling and disabling wireless devices"
 arch=('i686' 'x86_64')
 url="http://linuxwireless.org/en/users/Documentation/rfkill"
 license=('custom')
@@ -22,14 +22,17 @@
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  make
+}
 
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   # License
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   # Udev rule
-  install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/lib/udev/rules.d/60-rfkill.rules" || return 1
+  install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/lib/udev/rules.d/60-rfkill.rules"
   # Init script
-  install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill" || return 1
-  install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill" || return 1
+  install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill"
+  install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill"
 }