From 0549edffa4db527c57257a9249c1693b87daca97 Mon Sep 17 00:00:00 2001
From: John W. Linville <linville@fedoraproject.org>
Date: Feb 03 2009 19:13:10 +0000
Subject: Update wireless-regdb version to pick-up recent updates and fixes (#483816)


---

diff --git a/.cvsignore b/.cvsignore
index a562237..1ae7926 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 crda-1.0.1.tar.bz2
-wireless-regdb-2009-01-15.tar.bz2
+wireless-regdb-2009.01.30.tar.bz2
diff --git a/crda.spec b/crda.spec
index 2744b90..d9b4255 100644
--- a/crda.spec
+++ b/crda.spec
@@ -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 @@ Requires:       udev
 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
@@ -75,13 +75,18 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/%{name}
 /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
+%{_libdir}/%{name}
+%{_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@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@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
diff --git a/sources b/sources
index d4a8459..0e2d1b6 100644
--- a/sources
+++ b/sources
@@ -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
diff --git a/wireless-regdb-2009-01-15-non-root-install-fix.patch b/wireless-regdb-2009-01-15-non-root-install-fix.patch
deleted file mode 100644
index a1f6ab1..0000000
--- a/wireless-regdb-2009-01-15-non-root-install-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up wireless-regdb-2009-01-15/Makefile.orig wireless-regdb-2009-01-15/Makefile
---- wireless-regdb-2009-01-15/Makefile.orig	2009-01-20 15:32:18.000000000 -0500
-+++ wireless-regdb-2009-01-15/Makefile	2009-01-20 15:32:27.000000000 -0500
-@@ -24,5 +24,5 @@ key.priv.pem:
- 	openssl genrsa -out key.priv.pem 2048
- 
- install:
--	install -o 0 -g 0 -m 755 -d $(CDRA_PATH)
--	install -o 0 -g 0 -m 644 regulatory.bin $(CDRA_PATH)/regulatory.bin
-+	install -m 755 -d $(CDRA_PATH)
-+	install -m 644 regulatory.bin $(CDRA_PATH)/regulatory.bin
diff --git a/wireless-regdb-2009.01.30-non-root-install-fix.patch b/wireless-regdb-2009.01.30-non-root-install-fix.patch
new file mode 100644
index 0000000..c53bc49
--- /dev/null
+++ b/wireless-regdb-2009.01.30-non-root-install-fix.patch
@@ -0,0 +1,13 @@
+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