diff --git a/netsniff-ng-cmake_pod2man_without_stderr.patch b/netsniff-ng-cmake_pod2man_without_stderr.patch new file mode 100644 index 0000000..41810c9 --- /dev/null +++ b/netsniff-ng-cmake_pod2man_without_stderr.patch @@ -0,0 +1,11 @@ +--- src/cmake/modules/Pod2Man.cmake.orig 2012-03-29 20:59:45.606959367 +0200 ++++ src/cmake/modules/Pod2Man.cmake 2012-03-29 20:59:51.343959161 +0200 +@@ -30,7 +30,7 @@ + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION} + DEPENDS ${PODFILE} + COMMAND ${POD2MAN} +- ARGS --section ${SECTION} --center ${CMAKE_PROJECT_NAME} --release --stderr --name ${MANFILE} ++ ARGS --section ${SECTION} --center ${CMAKE_PROJECT_NAME} --release --name ${MANFILE} + ${PODFILE} > ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION} + ) + diff --git a/netsniff-ng.spec b/netsniff-ng.spec index 8c199dc..891c2e6 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -17,12 +17,20 @@ Version: 0.5.6 Release: 0 Summary: High Performance Network Sniffer for Packet Inspection Source: http://www.netsniff-ng.org/pub/netsniff-ng/netsniff-ng-%{version}.tar.gz +Patch1: netsniff-ng-cmake_pod2man_without_stderr.patch URL: http://code.google.com/p/netsniff-ng/ Group: Productivity/Networking/Diagnostic License: GPL-2.0+ BuildRoot: %{_tmppath}/build-%{name}-%{version} BuildRequires: ncurses-devel BuildRequires: libGeoIP-devel +%if 0%{?suse_version} >= 1130 +BuildRequires: libnetfilter_conntrack-devel +BuildRequires: liburcu-devel +%define with_nf 1 +%else +%define with_nf 0 +%endif BuildRequires: flex bison BuildRequires: cmake gcc make glibc-devel BuildRequires: autoconf automake libtool @@ -39,6 +47,9 @@ firewalls. %prep %setup -q +%if 0%{?suse_version} < 1140 +%patch1 +%endif %build %__install -d build @@ -46,7 +57,7 @@ pushd build cmake \ -DCMAKE_INSTALL_PREFIX="%{_usr}" \ ../src/ -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} VERBOSE=1 popd %install @@ -72,5 +83,9 @@ popd %doc %{_mandir}/man8/ifpps.8* %doc %{_mandir}/man8/netsniff-ng.8* %doc %{_mandir}/man8/trafgen.8* +%if %with_nf +%{_sbindir}/flowtop +%doc %{_mandir}/man8/flowtop.8* +%endif %changelog