diff options
| author | thomas | 2009-05-31 17:12:07 +0000 |
|---|---|---|
| committer | Petko Bordjukov | 2015-06-09 13:47:54 +0300 |
| commit | 5052c5b2f5229f9c95c663a546cdf482575ace07 (patch) | |
| tree | 4b060d4389433def4f32b65653594de4f70e2f41 | |
| parent | 2238e6ea3c14377e37c9f21c31ee8029da5b9629 (diff) | |
| download | aur-5052c5b2f5229f9c95c663a546cdf482575ace07.tar.gz | |
upgpkg: crda 1.1.0-1
git-svn-id: file:///srv/repos/svn-packages/svn@40883 eb2447ed-0c53-47e4-bac8-5bc4a241df78
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | crda.install | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -2,8 +2,8 @@ # Maintainer: Thomas Bächler <thomas@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 @@ makedepends=('python-m2crypto') install=crda.install source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 crda.rc) -md5sums=('03554b71eef2626795befa17eb1d8b9e' +md5sums=('6004584d2e39e899f7642b141dd72028' '014eef3f8655e9a130064ec6891317fc') build() { diff --git a/crda.install b/crda.install index 9c5be406cf8c..c18e15f710f9 100644 --- a/crda.install +++ b/crda.install @@ -10,7 +10,9 @@ post_upgrade() { # 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 } |