From b664dc9410435d51ff77c144a9dbfa836ff9ddc1 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 9 Feb 2014 15:05:35 +0100
Subject: [PATCH] - updated to 3.13 - new Source0 URL, more specific URL -
 added destdir and link patches

---
 crda-destdir.patch | 22 ++++++++++++++++++
 crda-link.patch    | 11 +++++++++
 crda.spec          | 56 ++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 82 insertions(+), 7 deletions(-)
 create mode 100644 crda-destdir.patch
 create mode 100644 crda-link.patch

diff --git a/crda-destdir.patch b/crda-destdir.patch
new file mode 100644
index 0000000..e736904
--- /dev/null
+++ b/crda-destdir.patch
@@ -0,0 +1,22 @@
+--- crda-3.13/Makefile.orig	2013-11-20 13:12:54.000000000 +0100
++++ crda-3.13/Makefile	2014-02-09 14:55:48.603465772 +0100
+@@ -119,14 +119,14 @@
+ 
+ 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)ldconfig
++	$(Q)mkdir -p $(DESTDIR)$(LIBDIR)
++	$(Q)cp $(LIBREG) $(DESTDIR)$(LIBDIR)/
++	$(Q)-ldconfig
+ 
+ %.o: %.c regdb.h $(LIBREG)
+ 	$(NQ) '  CC  ' $@
diff --git a/crda-link.patch b/crda-link.patch
new file mode 100644
index 0000000..8220803
--- /dev/null
+++ b/crda-link.patch
@@ -0,0 +1,11 @@
+--- crda-3.13/Makefile.orig	2014-02-09 14:56:57.600129540 +0100
++++ crda-3.13/Makefile	2014-02-09 15:02:37.646781938 +0100
+@@ -115,7 +115,7 @@
+ 
+ $(LIBREG): regdb.h reglib.h reglib.c
+ 	$(NQ) '  CC  ' $@
+-	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^
++	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDLIBS)
+ 
+ install-libreg-headers:
+ 	$(NQ) '  INSTALL  libreg-headers'
diff --git a/crda.spec b/crda.spec
index 2f142fc..8709fbe 100644
--- a/crda.spec
+++ b/crda.spec
@@ -1,19 +1,21 @@
 #
 # Conditional build:
-%bcond_with	verify	# don't verify database
+%bcond_with	verify	# database verification
 %bcond_without	verbose	# verbose build (V=1)
 
 Summary:	udev helper: Central Regulatory Domain Agent
 Summary(pl.UTF-8):	Program pomocniczy udev: Central Regulatory Domain Agent
 Name:		crda
-Version:	1.1.3
-Release:	4
+Version:	3.13
+Release:	1
 License:	ISC
 Group:		Networking/Daemons
-Source0:	http://linuxwireless.org/download/crda/%{name}-%{version}.tar.bz2
-# Source0-md5:	29579185e06a75675507527243d28e5c
+Source0:	https://www.kernel.org/pub/software/network/crda/%{name}-%{version}.tar.xz
+# Source0-md5:	66b1b0417c1ad19f0009a5c0c0c1aebc
 Patch0:		%{name}-regdb.patch
-URL:		http://wireless.kernel.org/en/developers/Regulatory
+Patch1:		%{name}-destdir.patch
+Patch2:		%{name}-link.patch
+URL:		http://wireless.kernel.org/en/developers/Regulatory/CRDA
 BuildRequires:	libgcrypt-devel
 BuildRequires:	libnl-devel >= 1:3.2
 BuildRequires:	pkgconfig
@@ -21,6 +23,9 @@ BuildRequires:	python
 BuildRequires:	python-M2Crypto
 BuildRequires:	python-modules
 %{?with_verify:BuildRequires:	wireless-regdb}
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	udev-core
 Requires:	wireless-regdb
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -39,9 +44,34 @@ przepisami. Na potrzeby komunikacji polega na nl80211. CRDA jest
 przeznaczone do uruchamiania wyłącznie poprzez udev. Użytkownik nigdy
 nie powinien wywoływać go ręcznie, chyba że w celach diagnostyki udev.
 
+%package libs
+Summary:	CRDA libreg shared library
+Summary(pl.UTF-8):	Biblioteka współdzielona CRDA libreg
+Group:		Libraries
+
+%description libs
+CRDA libreg shared library.
+
+%description libs -l pl.UTF-8
+Biblioteka współdzielona CRDA libreg.
+
+%package devel
+Summary:	Header files for CRDA libreg library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki CRDA libreg
+Group:		Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description devel
+Header files for CRDA libreg library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki CRDA libreg.
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 CFLAGS="%{rpmcflags} %{rpmcppflags}" \
@@ -58,11 +88,15 @@ CFLAGS="%{rpmcflags} %{rpmcppflags}" \
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	%{?with_verbose:V=1} \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	LIBDIR=/%{_lib}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README
@@ -71,3 +105,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/crda.8*
 %{_mandir}/man8/regdbdump.8*
 /lib/udev/rules.d/85-regulatory.rules
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/libreg.so
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/reglib
-- 
2.43.0