rpms/crda/devel setregdomain.1,NONE,1.1 crda.spec,1.25,1.26

[John W. Linville]

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1755

Modified Files:
	crda.spec 
Added Files:
	setregdomain.1 
Log Message:
Add man page for setregdomain (from Andrew Hecox <ahecox at redhat.com>) ; Change  to %{buildroot}


--- NEW FILE setregdomain.1 ---
.\" Copyright 2009 Red Hat, Inc.
.TH segregdomain 1 2009-10-16 "CRDA" "User Commands"
.SH NAME
setregdomain \- set regulatory domain based on timezone
.SH SYNOPSIS               
.B setregdomain                  
.SH DESCRIPTION
setregdomain sets the regulatory domain for your system; it takes no
arguments and is normally called via system script (eg, udev) rather
than manually by an adminstrator.
.SH "SEE ALSO"
.BR iw (1)


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- crda.spec	18 Dec 2009 19:25:23 -0000	1.25
+++ crda.spec	21 Dec 2009 21:06:40 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -15,27 +15,32 @@ BuildRequires:  kernel-headers >= 2.6.27
 BuildRequires:  libnl-devel >= 1.1
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig python m2crypto
+BuildRequires:  gzip
 
 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
 Source2:        setregdomain
+Source3:        setregdomain.1
 
 Patch0:         regulatory-rules-setregdomain.patch
 
+
 %description
 CRDA acts as the udev helper for communication between the kernel
 and userspace for regulatory compliance. It relies on nl80211
 for communication. CRDA is intended to be run only through udev
 communication from the kernel.
 
+
 %prep
 %setup -q -c
 %setup -q -T -D -a 1
 
 %patch0 -p1 -b .setregdomain
 
+
 %build
 
 # Use our own signing key to generate regulatory.bin
@@ -52,20 +57,27 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FL
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 cd crda-%{crda_version}
 cp README README.crda
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
+make install DESTDIR=%{buildroot} PREFIX='' MANDIR=%{_mandir}
 
 cd ../wireless-regdb-%{regdb_version}
 cp README README.wireless-regdb
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
+make install DESTDIR=%{buildroot} PREFIX='' MANDIR=%{_mandir}
+
+install -d %{buildroot}/sbin
+install -pm 0755 %SOURCE2 %{buildroot}/sbin
+
+cd ..
+/usr/bin/gzip -c %SOURCE3 > %{SOURCE3}.gz
+install -d %{buildroot}%{_mandir}/man1
+install -pm 0644 %{SOURCE3}.gz %{buildroot}%{_mandir}/man1
 
-install -D -m0755 %SOURCE2 ${RPM_BUILD_ROOT}/sbin
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -75,15 +87,21 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/setregdomain
 /lib/udev/rules.d/85-regulatory.rules
 /lib/%{name}
+%{_mandir}/man1/setregdomain.1.gz
 %{_mandir}/man5/regulatory.bin.5.gz
 %{_mandir}/man8/crda.8.gz
 %{_mandir}/man8/regdbdump.8.gz
 %doc crda-%{crda_version}/LICENSE crda-%{crda_version}/README.crda
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
+
 %changelog
+* Mon Dec 21 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-3
+- Add man page for setregdomain (from Andrew Hecox <ahecox at redhat.com>)
+- Change $RPM_BUILD_ROOT to %{buildroot}
+
 * Fri Dec 18 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-2
-- Specify patch to iw in setregdomain
+- Specify path to iw in setregdomain
 
 * Wed Dec  2 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-1
 - Update wireless-regdb to version 2009.11.25