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

[Andrea Scarpino]

    Date: Friday, November 19, 2010 @ 10:14:04
  Author: andrea
Revision: 99939

upgpkg: wireless-regdb 2009.11.25-2
add sh to depends array; rebuild to use .tar.xz

Modified:
  wireless-regdb/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-19 15:13:52 UTC (rev 99938)
+++ PKGBUILD	2010-11-19 15:14:04 UTC (rev 99939)
@@ -3,24 +3,24 @@
 
 pkgname=wireless-regdb
 pkgver=2009.11.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Central Regulatory Domain Database"
-arch=(any)
+arch=('any')
 url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
+backup=(etc/conf.d/wireless-regdom)
 license=('custom')
-depends=()
+depends=('sh')
 install=wireless-regdb.install
 source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         crda.conf.d)
 sha256sums=('b9d569a41f66323339b7aa203db6e2d8f39c98192f134b5eef2135cf09cd943f'
             '192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b')
-backup=(etc/conf.d/wireless-regdom)
 
-build() {
+package() {
   # Install and verify regulatory.bin file
   msg "Installing and verifying the regulatory.bin file ..."
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
   # If crda is installed, the wireless regdb can be verified using regdbdump
   # Keep this step optional so no depend/makedepend loop is created
   if [ -x /sbin/regdbdump ]; then
@@ -35,11 +35,12 @@
   fi
   
   msg "Installing /etc/conf.d/wireless-regdom ..."
-  install -D -m644 ${srcdir}/crda.conf.d ${pkgdir}/etc/conf.d/wireless-regdom || return 1
+  install -D -m644 ${srcdir}/crda.conf.d ${pkgdir}/etc/conf.d/wireless-regdom
   for dom in $(grep ^country ${srcdir}/${pkgname}-${pkgver}/db.txt | cut -d' ' -f2 | sed 's|:||g'); do
-    echo "#WIRELESS_REGDOM=\"${dom}\"" >> ${pkgdir}/etc/conf.d/wireless-regdom.tmp || return 1
+    echo "#WIRELESS_REGDOM=\"${dom}\"" >> ${pkgdir}/etc/conf.d/wireless-regdom.tmp
   done
-  sort -u ${pkgdir}/etc/conf.d/wireless-regdom.tmp >> ${pkgdir}/etc/conf.d/wireless-regdom || return 1
-  rm -f ${pkgdir}/etc/conf.d/wireless-regdom.tmp || return 1
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  sort -u ${pkgdir}/etc/conf.d/wireless-regdom.tmp >> ${pkgdir}/etc/conf.d/wireless-regdom
+  rm -f ${pkgdir}/etc/conf.d/wireless-regdom.tmp
+
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }