rpms/crda/F-10 crda.spec,1.7,1.8 setregdomain,1.1,1.2

[John W. Linville]

Author: linville

Update of /cvs/pkgs/rpms/crda/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31180

Modified Files:
	crda.spec setregdomain 
Log Message:
Add Requires line for iw package (#492762) ; Update setregdomain script to correctly check if COUNTRY is set


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/crda.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- crda.spec	19 Mar 2009 18:04:46 -0000	1.7
+++ crda.spec	31 Mar 2009 17:50:50 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -16,7 +16,7 @@
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig python m2crypto
 
-Requires:       udev
+Requires:       udev, iw
 
 Source0:        http://wireless.kernel.org/download/crda/crda-%{crda_version}.tar.bz2
 Source1:        http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2
@@ -83,6 +83,10 @@
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Tue Mar 31 2009 John W. Linville <linville at redhat.com> 1.0.1_2009.03.09-9
+- Add Requires line for iw package (#492762)
+- Update setregdomain script to correctly check if COUNTRY is set
+
 * Thu Mar 19 2009 John W. Linville <linville at redhat.com> 1.0.1_2009.03.09-8
 - Add setregdomain script to set regulatory domain based on timezone
 - Expand 85-regulatory.rules to invoke setregdomain script on device add


Index: setregdomain
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/setregdomain,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setregdomain	19 Mar 2009 18:04:46 -0000	1.1
+++ setregdomain	31 Mar 2009 17:50:50 -0000	1.2
@@ -7,8 +7,11 @@
 then
 	# This should set COUNTRY
 	. $REGDOMAIN
-	iw reg set $COUNTRY
-	exit
+	if [ -n "$COUNTRY" ]
+	then
+		iw reg set $COUNTRY
+		exit
+	fi
 fi
 
 if [ -f $CLOCK ]