[arch-commits] Commit in crda/trunk (PKGBUILD crda.install)

[Thomas Bächler]

    Date: Sunday, May 31, 2009 @ 13:12:07
  Author: thomas
Revision: 40883

upgpkg: crda 1.1.0-1

Modified:
  crda/trunk/PKGBUILD
  crda/trunk/crda.install

--------------+
 PKGBUILD     |    6 +++---
 crda.install |    6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-31 17:01:21 UTC (rev 40882)
+++ PKGBUILD	2009-05-31 17:12:07 UTC (rev 40883)
@@ -2,8 +2,8 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=crda
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="Central Regulatory Domain Agent"
 arch=(i686 x86_64)
 url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
@@ -13,7 +13,7 @@
 install=crda.install
 source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
         crda.rc)
-md5sums=('03554b71eef2626795befa17eb1d8b9e'
+md5sums=('6004584d2e39e899f7642b141dd72028'
          '014eef3f8655e9a130064ec6891317fc')
                   
 build() {

Modified: crda.install
===================================================================
--- crda.install	2009-05-31 17:01:21 UTC (rev 40882)
+++ crda.install	2009-05-31 17:12:07 UTC (rev 40883)
@@ -10,7 +10,9 @@
   # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package
   # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one
   # from wireless-regdb by the user-defined one
-  if [ $(vercmp $2 1.0.1-2) -lt 0 -a -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then
-    mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom
+  if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then
+    if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then
+      mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom
+    fi
   fi
 }