Also updates the wireless reg domain database to 2016.02.08

Signed-off-by: Alexander Marx alexander.marx@ipfire.org --- crda/crda.nm | 4 +-- ...TDIR-support-in-install-libreg-rules-in-.patch0 | 36 ---------------------- crda/patches/crda-remove-ldconfig.patch0 | 11 ------- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 crda/patches/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch0 delete mode 100644 crda/patches/crda-remove-ldconfig.patch0

diff --git a/crda/crda.nm b/crda/crda.nm index 76993a5..e54dad3 100644 --- a/crda/crda.nm +++ b/crda/crda.nm @@ -5,8 +5,8 @@

name = crda version = %{ver_crda}-%{ver_regdb} -ver_crda = 3.13 -ver_regdb = 2014.06.13 +ver_crda = 3.18 +ver_regdb = 2016.02.08 release = 1

maintainer = Arne Fitzenreiter arne.fitzenreiter@ipfire.org diff --git a/crda/patches/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch0 b/crda/patches/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch0 deleted file mode 100644 index 9085718..0000000 --- a/crda/patches/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch0 +++ /dev/null @@ -1,36 +0,0 @@ -From 79f5cb8d130a635e0ee3eeb6a061a31d6bd7286e Mon Sep 17 00:00:00 2001 -From: "John W. Linville" linville@tuxdriver.com -Date: Fri, 14 Feb 2014 13:39:14 -0500 -Subject: [PATCH] crda: Add DESTDIR support in install-libreg* rules in - Makefile - -Signed-off-by: John W. Linville linville@tuxdriver.com ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 4a351c645bf4..807a53819453 100644 ---- crda-3.13/Makefile -+++ crda-3.13/Makefile -@@ -119,13 +119,13 @@ $(LIBREG): regdb.h reglib.h reglib.c - - install-libreg-headers: - $(NQ) ' INSTALL libreg-headers' -- $(Q)mkdir -p $(INCLUDE_DIR) -- $(Q)cp *.h $(INCLUDE_DIR)/ -+ $(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR) -+ $(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/ - - install-libreg: - $(NQ) ' INSTALL libreg' -- $(Q)mkdir -p $(LIBDIR) -- $(Q)cp $(LIBREG) $(LIBDIR)/ -+ $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) -+ $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ - $(Q)ldconfig - - %.o: %.c regdb.h $(LIBREG) --- -1.8.5.3 - diff --git a/crda/patches/crda-remove-ldconfig.patch0 b/crda/patches/crda-remove-ldconfig.patch0 deleted file mode 100644 index b9ba785..0000000 --- a/crda/patches/crda-remove-ldconfig.patch0 +++ /dev/null @@ -1,11 +0,0 @@ -diff -up crda-3.13/Makefile.ldconfig crda-3.13/Makefile ---- crda-3.13/Makefile.ldconfig 2014-02-14 13:47:10.674521882 -0500 -+++ crda-3.13/Makefile 2014-02-14 13:47:14.284552473 -0500 -@@ -126,7 +126,6 @@ install-libreg: - $(NQ) ' INSTALL libreg' - $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) - $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ -- $(Q)ldconfig - - %.o: %.c regdb.h $(LIBREG) - $(NQ) ' CC ' $@