rpms/crda/F-11 .cvsignore, 1.12, 1.13 crda.spec, 1.23, 1.24 regulatory-rules-setregdomain.patch, 1.2, 1.3 sources, 1.10, 1.11
John W. Linville
linville at fedoraproject.org
Tue Jan 26 18:34:54 UTC 2010
Author: linville
Update of /cvs/pkgs/rpms/crda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1343
Modified Files:
.cvsignore crda.spec regulatory-rules-setregdomain.patch
sources
Log Message:
Update for crda version 1.1.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore 2 Dec 2009 21:56:44 -0000 1.12
+++ .cvsignore 26 Jan 2010 18:34:54 -0000 1.13
@@ -1,2 +1,2 @@
-crda-1.1.0.tar.bz2
wireless-regdb-2009.11.25.tar.bz2
+crda-1.1.1.tar.bz2
Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/crda.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- crda.spec 18 Dec 2009 19:31:37 -0000 1.23
+++ crda.spec 26 Jan 2010 18:34:54 -0000 1.24
@@ -1,9 +1,9 @@
-%define crda_version 1.1.0
+%define crda_version 1.1.1
%define regdb_version 2009.11.25
Name: crda
Version: %{crda_version}_%{regdb_version}
-Release: 2%{?dist}
+Release: 1%{?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,30 @@ 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
+* Tue Dec 21 2009 John W. Linville <linville at redhat.com> 1.1.1_2009.11.25-1
+- Update for crda version 1.1.1
+
+* Tue Dec 21 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-5
+- Remove unnecessary explicit Requries for libgcrypt and libnl -- oops!
+
+* Tue Dec 21 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-4
+- Add libgcrypt and libnl to Requires
+
+* 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
regulatory-rules-setregdomain.patch:
regulatory.rules | 2 ++
1 file changed, 2 insertions(+)
Index: regulatory-rules-setregdomain.patch
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/regulatory-rules-setregdomain.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- regulatory-rules-setregdomain.patch 13 May 2009 17:47:25 -0000 1.2
+++ regulatory-rules-setregdomain.patch 26 Jan 2010 18:34:54 -0000 1.3
@@ -1,10 +1,10 @@
-diff -up crda-1.1.0_2009.04.17/crda-1.1.0/udev/regulatory.rules.orig crda-1.1.0_2009.04.17/crda-1.1.0/udev/regulatory.rules
---- crda-1.1.0_2009.04.17/crda-1.1.0/udev/regulatory.rules.orig 2009-04-17 17:49:45.000000000 -0400
-+++ crda-1.1.0_2009.04.17/crda-1.1.0/udev/regulatory.rules 2009-05-13 13:34:23.000000000 -0400
+diff -up crda-1.1.1_2009.11.25/crda-1.1.1/udev/regulatory.rules.orig crda-1.1.1_2009.11.25/crda-1.1.1/udev/regulatory.rules
+--- crda-1.1.1_2009.11.25/crda-1.1.1/udev/regulatory.rules.orig 2010-01-26 13:01:51.000000000 -0500
++++ crda-1.1.1_2009.11.25/crda-1.1.1/udev/regulatory.rules 2010-01-26 13:01:41.000000000 -0500
@@ -2,4 +2,6 @@
# For more information see:
# http://wireless.kernel.org/en/developers/Regulatory/CRDA
+SUBSYSTEM=="ieee80211", ACTION=="add", RUN+="/sbin/setregdomain"
+
- KERNEL=="regulatory*", ACTION=="change", SUBSYSTEM=="platform", RUN+="$(SBINDIR)/crda"
+ KERNEL=="regulatory*", ACTION=="change", SUBSYSTEM=="platform", RUN+="$(SBINDIR)crda"
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 2 Dec 2009 21:56:44 -0000 1.10
+++ sources 26 Jan 2010 18:34:54 -0000 1.11
@@ -1,2 +1,2 @@
-6004584d2e39e899f7642b141dd72028 crda-1.1.0.tar.bz2
73166199a4df3854fa81500b5c9a639b wireless-regdb-2009.11.25.tar.bz2
+5fc77af68b3e21736b8ef2f8b061c810 crda-1.1.1.tar.bz2
More information about the scm-commits
mailing list