X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crda.spec;h=5d4d484d8d3072935020c531e168670cd50684a5;hb=c6973b769c515ba4180a6bd8aa093d3c292f4bf6;hp=722a338ee1b8487eb3929a4e72f3273958dcc289;hpb=5b5b3cf4334be5ab84122080d3cf7681a905f86b;p=packages%2Fcrda.git

diff --git a/crda.spec b/crda.spec
index 722a338..5d4d484 100644
--- a/crda.spec
+++ b/crda.spec
@@ -1,24 +1,31 @@
 #
 # Conditional build:
-%bcond_without	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.2
+Version:	3.18
 Release:	2
 License:	ISC
 Group:		Networking/Daemons
-Source0:	http://linuxwireless.org/download/crda/%{name}-%{version}.tar.bz2
-# Source0-md5:	5226f65aebacf94baaf820f8b4e06df4
-Patch0:		nl3.patch
-URL:		http://wireless.kernel.org/en/developers/Regulatory
+Source0:	https://www.kernel.org/pub/software/network/crda/%{name}-%{version}.tar.xz
+# Source0-md5:	0431fef3067bf503dfb464069f06163a
+Patch0:		%{name}-regdb.patch
+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
 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)
@@ -37,26 +44,59 @@ 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}" \
-%{__make} %{!?with_verify:all_noverify} \
-	V=1 \
+%{__make} \
 	CC="%{__cc}" \
-	REG_BIN=%{_datadir}/crda/regulatory.bin
+	%{?with_verbose:V=1} \
+%if %{with verify}
+	REG_BIN=%{_datadir}/crda/regulatory.bin \
+%else
+	all_noverify \
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	%{?with_verbose:V=1} \
+	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
@@ -65,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