rpms/crda/F-10 wireless-regdb-2009.01.30-non-root-install-fix.patch, NONE, 1.1 crda.spec, 1.3, 1.4 sources, 1.3, 1.4 wireless-regdb-2009-01-15-non-root-install-fix.patch, 1.1, NONE

[John W. Linville]

Author: linville

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

Modified Files:
	crda.spec sources 
Added Files:
	wireless-regdb-2009.01.30-non-root-install-fix.patch 
Removed Files:
	wireless-regdb-2009-01-15-non-root-install-fix.patch 
Log Message:
Update wireless-regdb version to pick-up recent updates and fixes (#483816)

wireless-regdb-2009.01.30-non-root-install-fix.patch:

--- NEW FILE wireless-regdb-2009.01.30-non-root-install-fix.patch ---
diff -up wireless-regdb-2009.01.30/Makefile.orig wireless-regdb-2009.01.30/Makefile
--- wireless-regdb-2009.01.30/Makefile.orig	2009-01-30 15:39:04.000000000 -0500
+++ wireless-regdb-2009.01.30/Makefile	2009-02-03 13:51:05.000000000 -0500
@@ -32,7 +32,7 @@ key.priv.pem:
 # Distributions wishing to just use John's database
 # can just call make install.
 install: regulatory.bin.5.gz
-	install -o 0 -g 0 -m 755 -d $(DESTDIR)/$(CDRA_PATH)
-	install -o 0 -g 0 -m 644 regulatory.bin $(DESTDIR)/$(CDRA_PATH)/regulatory.bin
+	install -m 755 -d $(DESTDIR)/$(CDRA_PATH)
+	install -m 644 regulatory.bin $(DESTDIR)/$(CDRA_PATH)/regulatory.bin
 	mkdir -p $(DESTDIR)/$(MANDIR)/man5/
 	install -m 644 -t $(DESTDIR)/$(MANDIR)/man5/ regulatory.bin.5.gz


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/crda.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- crda.spec	27 Jan 2009 20:20:21 -0000	1.3
+++ crda.spec	3 Feb 2009 19:26:23 -0000	1.4
@@ -1,9 +1,9 @@
 %define         crda_version    1.0.1
-%define         regdb_version   2009-01-15
+%define         regdb_version   2009.01.30
 
 Name:           crda
-Version:        %{crda_version}_%(echo %{regdb_version} | sed -e 's/-/_/g')
-Release:        3%{?dist}
+Version:        %{crda_version}_%{regdb_version}
+Release:        4%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -21,7 +21,7 @@
 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
+Patch0:         wireless-regdb-2009.01.30-non-root-install-fix.patch
 
 %description
 CRDA acts as the udev helper for communication between the kernel
@@ -76,12 +76,17 @@
 /sbin/regdbdump
 /lib/udev/rules.d/85-regulatory.rules
 /usr/lib/%{name}
-/usr/share/man/man8/crda.8.gz
-/usr/share/man/man8/regdbdump.8.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 Jan 27 2008 John W. Linville <linville at redhat.com> 1.0.1_2009.01.30-4
+- Change version to reflect new wireless-regdb upstream release practices
+- Update wireless-regdb version to pick-up recent updates and fixes (#483816)
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Jan 2009 19:44:43 -0000	1.3
+++ sources	3 Feb 2009 19:26:23 -0000	1.4
@@ -1,2 +1,2 @@
 03554b71eef2626795befa17eb1d8b9e  crda-1.0.1.tar.bz2
-7d132c16850eb9f9102194fe9c6e45d4  wireless-regdb-2009-01-15.tar.bz2
+9e7812f7befe96511a597c1635f9a42b  wireless-regdb-2009.01.30.tar.bz2


--- wireless-regdb-2009-01-15-non-root-install-fix.patch DELETED ---