crda: Update to 3.13 (wireless-regdb 2014.06.13)

diff --git a/crda/crda.nm b/crda/crda.nm
index 64e775cf8beae790a9083ba6dd5aecf9c501e621..76993a5904f5ace55e90a122afd622724587d2c5 100644 (file)
--- a/crda/crda.nm
+++ b/crda/crda.nm
@@ -5,8 +5,8 @@
 
 name       = crda
 version    = %{ver_crda}-%{ver_regdb}
-ver_crda   = 1.1.3
-ver_regdb  = 2013.02.13
+ver_crda   = 3.13
+ver_regdb  = 2014.06.13
 release    = 1
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
@@ -23,14 +23,14 @@ description
 end
 
 source_dl  = \
-       http://wireless.kernel.org/download/crda/ \
+       https://www.kernel.org/pub/software/network/crda/ \
        https://www.kernel.org/pub/software/network/wireless-regdb/
-sources    = crda-%{ver_crda}.tar.bz2 wireless-regdb-%{ver_regdb}.tar.xz
+sources    = crda-%{ver_crda}.tar.xz wireless-regdb-%{ver_regdb}.tar.xz
 
 build
        requires
                libgcrypt-devel
-               libnl-devel
+               libnl3-devel
                openssl
                python-m2crypto
        end
@@ -54,7 +54,8 @@ build
                popd
 
                pushd %{DIR_SRC}/crda-%{ver_crda}
-               make install DESTDIR=%{BUILDROOT} PREFIX=%{prefix} MANDIR=%{mandir}
+               make install DESTDIR=%{BUILDROOT} PREFIX=%{prefix} MANDIR=%{mandir} \
+                       SBINDIR=%{sbindir}/ LIBDIR=%{libdir}/
                popd
        end
 end
@@ -65,6 +66,12 @@ packages
                obsoletes = wireless-regdb < %{ver_regdb}
        end
 
+       package %{name}-devel
+               template DEVEL
+
+               files += !%{libdir}/libreg.so
+       end
+
        package %{name}-debuginfo
                template DEBUGINFO
        end

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
new file mode 100644 (file)
index 0000000..9085718
--- /dev/null
+++ b/crda/patches/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch0
@@ -0,0 +1,36 @@
+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
new file mode 100644 (file)
index 0000000..b9ba785
--- /dev/null
+++ b/crda/patches/crda-remove-ldconfig.patch0
@@ -0,0 +1,11 @@
+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  ' $@