- pl

- use optflags
- added bcond_without verify
- libnl-devel BR bumped because of nl3 patch

Changed files:
    crda.spec -> 1.10

diff --git a/crda.spec b/crda.spec
index 8aa00089e625f5a52f8b03f357f9735551f9f3d9..722a338ee1b8487eb3929a4e72f3273958dcc289 100644 (file)
--- a/crda.spec
+++ b/crda.spec
@@ -1,4 +1,9 @@
+#
+# Conditional build:
+%bcond_without verify  # don't verify database
+#

 Summary:       udev helper: Central Regulatory Domain Agent
 Summary:       udev helper: Central Regulatory Domain Agent

+Summary(pl.UTF-8):     Program pomocniczy udev: Central Regulatory Domain Agent

 Name:          crda
 Version:       1.1.2
 Release:       2
 Name:          crda
 Version:       1.1.2
 Release:       2


@@ -7,28 +12,38 @@ Group:               Networking/Daemons
 Source0:       http://linuxwireless.org/download/crda/%{name}-%{version}.tar.bz2
 # Source0-md5: 5226f65aebacf94baaf820f8b4e06df4
 Patch0:                nl3.patch
 Source0:       http://linuxwireless.org/download/crda/%{name}-%{version}.tar.bz2
 # Source0-md5: 5226f65aebacf94baaf820f8b4e06df4
 Patch0:                nl3.patch

+URL:           http://wireless.kernel.org/en/developers/Regulatory

 BuildRequires: libgcrypt-devel
 BuildRequires: libgcrypt-devel

-BuildRequires: libnl-devel >= 1:3.0
+BuildRequires: libnl-devel >= 1:3.2
+BuildRequires: pkgconfig

 BuildRequires: python
 BuildRequires: python-M2Crypto
 BuildRequires: python
 BuildRequires: python-M2Crypto

-BuildRequires: wireless-regdb
+%{?with_verify:BuildRequires:  wireless-regdb}

 Requires:      udev-core
 Requires:      wireless-regdb
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 CRDA acts as the udev helper for communication between the kernel and
 Requires:      udev-core
 Requires:      wireless-regdb
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 CRDA acts as the udev helper for communication between the kernel and

-userspace for regulatory compliance. It relies on nl80211 for
+userspace for wireless regulatory compliance. It relies on nl80211 for

 communication. CRDA is intended to be run only through udev
 communication from the kernel. The user should never have to run it
 manually except if debugging udev issues.
 
 communication. CRDA is intended to be run only through udev
 communication from the kernel. The user should never have to run it
 manually except if debugging udev issues.
 

+%description -l pl.UTF-8
+CRDA działa jako program pomocniczy udev do komunikacji między jądrem
+a przestrzenią użytkownika w celu zgodności łączności bezprzewodowej z
+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.
+

 %prep
 %setup -q
 %patch0 -p1
 
 %build
 %prep
 %setup -q
 %patch0 -p1
 
 %build

-%{__make} \
+CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+%{__make} %{!?with_verify:all_noverify} \

        V=1 \
        CC="%{__cc}" \
        REG_BIN=%{_datadir}/crda/regulatory.bin
        V=1 \
        CC="%{__cc}" \
        REG_BIN=%{_datadir}/crda/regulatory.bin


@@ -44,8 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc README
+%doc LICENSE README

 %attr(755,root,root) /sbin/crda
 %attr(755,root,root) /sbin/regdbdump
 %attr(755,root,root) /sbin/crda
 %attr(755,root,root) /sbin/regdbdump

-%{_mandir}/man8/*
+%{_mandir}/man8/crda.8*
+%{_mandir}/man8/regdbdump.8*

 /lib/udev/rules.d/85-regulatory.rules
 /lib/udev/rules.d/85-regulatory.rules