rpms/crda/F-10 crda.spec,1.2,1.3

[John W. Linville]

Author: linville

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

Modified Files:
	crda.spec 
Log Message:
build fixes


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/crda.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crda.spec	27 Jan 2009 19:44:43 -0000	1.2
+++ crda.spec	27 Jan 2009 20:20:21 -0000	1.3
@@ -21,6 +21,8 @@
 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
 
+Patch0:         wireless-regdb-2009-01-15-non-root-install-fix.patch
+
 %description
 CRDA acts as the udev helper for communication between the kernel
 and userspace for regulatory compliance. It relies on nl80211
@@ -31,6 +33,8 @@
 %setup -q -c
 %setup -q -T -D -a 1
 
+%patch0 -p0
+
 rm crda-%{crda_version}/pubkeys/*
 
 
@@ -57,11 +61,6 @@
 cp README README.crda
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Fixup some directory and file naming
-mkdir -p ${RPM_BUILD_ROOT}/lib/udev/
-mv ${RPM_BUILD_ROOT}/etc/udev/rules.d ${RPM_BUILD_ROOT}/lib/udev/rules.d
-mv ${RPM_BUILD_ROOT}/lib/udev/rules.d/regulatory.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/10-regulatory.rules
-
 cd ../wireless-regdb-%{regdb_version}
 cp README README.wireless-regdb
 make install PREFIX=${RPM_BUILD_ROOT}/usr
@@ -75,8 +74,10 @@
 %defattr(-,root,root,-)
 /sbin/%{name}
 /sbin/regdbdump
-/lib/udev/rules.d/10-regulatory.rules
+/lib/udev/rules.d/85-regulatory.rules
 /usr/lib/%{name}
+/usr/share/man/man8/crda.8.gz
+/usr/share/man/man8/regdbdump.8.gz
 %doc crda-%{crda_version}/LICENSE crda-%{crda_version}/README.crda
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
@@ -84,6 +85,7 @@
 * Tue Jan 27 2008 John W. Linville <linville at redhat.com> 1.0.1_2009_01_15-3
 - Update for CRDA verion 1.0.1
 - Account for lack of "v" in upstream release tarball naming
+- Add patch to let wireless-regdb install w/o being root
 
 * Thu Jan 22 2008 John W. Linville <linville at redhat.com> v0.9.5_2009_01_15-2
 - Revamp based on package review comments