[netsniff-ng] Build with NaCl, i.e. build curvetun
Jaroslav Škarvada
jskarvad at fedoraproject.org
Tue Sep 4 12:04:49 UTC 2012
commit 86ae7a0c8d626795a82b3f00f5a25a7914fbbd25
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Tue Sep 4 14:04:43 2012 +0200
Build with NaCl, i.e. build curvetun
netsniff-ng.spec | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/netsniff-ng.spec b/netsniff-ng.spec
index e734a43..eb94f90 100644
--- a/netsniff-ng.spec
+++ b/netsniff-ng.spec
@@ -1,8 +1,9 @@
-%global with_nacl no
+# By default built with NaCl static lib
+%bcond_without nacl
Name: netsniff-ng
Version: 0.5.7
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Packet sniffing beast
Group: Applications/Internet
License: GPLv2
@@ -15,8 +16,8 @@ Patch1: netsniff-ng-0.5.7-flags.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: cmake ncurses-devel GeoIP-devel libnetfilter_conntrack-devel
BuildRequires: userspace-rcu-devel libnl-devel libcli-devel flex bison
-%if "%{with_nacl}" == "yes"
-BuildRequires: nacl-devel
+%if %{with nacl}
+BuildRequires: nacl-static
%endif
%description
@@ -40,7 +41,7 @@ netsniff-ng toolkit currently consists of the following utilities:
%patch0 -p1 -b .libcli-include-fix
%patch1 -p1 -b .flags
-%if "%{with_nacl}" == "yes"
+%if %{with nacl}
[ -r src/curvetun/nacl_path.cmake ] || \
cat > src/curvetun/nacl_path.cmake <<":eof"
SET(NACL_INCLUDE_DIR %{_includedir}/nacl)
@@ -71,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/*
%changelog
+* Tue Sep 4 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 0.5.7-7
+- Build with NaCl, i.e. build curvetun
+
* Mon Sep 3 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 0.5.7-6
- Extended package description according to upstream requirements
More information about the scm-commits
mailing list