- updated to 4.6.2

[packages/tcpdump.git] / tcpdump.spec

diff --git a/tcpdump.spec b/tcpdump.spec
index b8884cf96820af8dde125064d4021fd0214311a9..498d90af37baabc86b4aa927448d299a793c26df 100644 (file)
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -1,8 +1,8 @@
 #
 # Conditional build:
-%bcond_without libsmi  # Build without SMI support
-%bcond_with    drop_priv # Breaks w option
-
+%bcond_without libsmi          # Build without SMI support
+%bcond_with    drop_priv       # Breaks "-w" option
+#
 Summary:       dumps packets that are sent or received over a network interface
 Summary(de.UTF-8):     deponiert Pakete, die über eine Netzwerkschnittstelle gesandt oder empfangen werden
 Summary(es.UTF-8):     Enseña los paquetes que son enviados o recibidos a través de una interface de red
@@ -13,26 +13,28 @@ Summary(ru.UTF-8):  Инструмент для мониторинга сетев
 Summary(tr.UTF-8):     Bir ağ arabirimi üzerinden gelen ya da giden paketleri listeler
 Summary(uk.UTF-8):     Інструмент для моніторингу мережевого трафіку
 Name:          tcpdump
-Version:       4.2.0
-Release:       5
+Version:       4.6.2
+Release:       1
 Epoch:         1
 License:       BSD
 Group:         Networking/Utilities
 Source0:       http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: 0296d4c487c3a156879783643704bd39
+# Source0-md5: 74d0d3728b3cdc60db872d842e7f1598
 Patch0:                libpcap-m4.patch
-Patch1:                %{name}-ppi.patch
 URL:           http://www.tcpdump.org/
-BuildRequires: autoconf
-BuildRequires: libpcap-devel >= 2:1.2.0
+BuildRequires: autoconf >= 2.61
+BuildRequires: libcap-ng-devel
+BuildRequires: libpcap-devel >= 2:1.6.2
 %{?with_libsmi:BuildRequires:  libsmi-devel}
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: rpmbuild(macros) >= 1.202
-Requires:      libpcap >= 2:1.2.0
+Requires:      libpcap >= 2:1.6.2
+%if %{with drop_priv}
 Provides:      user(tcpdump)
-Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
+%endif
+Requires(postun):      /usr/sbin/userdel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -79,7 +81,6 @@ Tcpdump виводить хедери пакетів, що проходять ч
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__autoconf}
@@ -90,7 +91,8 @@ Tcpdump виводить хедери пакетів, що проходять ч
        --with-user=tcpdump \
        --with-chroot=/usr/share/empty \
 %endif
-       --enable-ipv6
+       --enable-ipv6 \
+       --with-crypto
 %{__make}
 
 %install
@@ -100,8 +102,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_sbindir}/tcpdump.%{version}
 
+%if %{with drop_priv}
 %pre
 %useradd -u 273 -r -d /usr/share/empty -s /bin/false -c "tcpdump User" -g nobody tcpdump
+%endif
 
 %postun
 if [ "$1" = "0" ]; then
@@ -113,6 +117,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES CREDITS LICENSE README
+%doc CHANGES CREDITS LICENSE README.md
 %attr(755,root,root) %{_sbindir}/tcpdump
 %{_mandir}/man1/tcpdump.1*