[packages/crda] add verbose bcond; BR python-modules

glen glen at pld-linux.org
Mon Mar 4 20:22:53 CET 2013


commit bf13832bb023fc18dee0d7b60534507939186b61
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Mar 4 21:22:24 2013 +0200

    add verbose bcond; BR python-modules

 crda.spec | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/crda.spec b/crda.spec
index cd1234c..90ff781 100644
--- a/crda.spec
+++ b/crda.spec
@@ -1,7 +1,8 @@
 #
 # Conditional build:
 %bcond_without	verify	# don't verify database
-#
+%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
@@ -18,6 +19,7 @@ BuildRequires:	libnl-devel >= 1:3.2
 BuildRequires:	pkgconfig
 BuildRequires:	python
 BuildRequires:	python-M2Crypto
+BuildRequires:	python-modules
 %{?with_verify:BuildRequires:	wireless-regdb}
 Requires:	udev-core
 Requires:	wireless-regdb
@@ -43,15 +45,19 @@ nie powinien wywoływać go ręcznie, chyba że w celach diagnostyki udev.
 
 %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 \
+	%{?with_verbose:V=1} \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crda.git/commitdiff/bf13832bb023fc18dee0d7b60534507939186b61



More information about the pld-cvs-commit mailing list