- hide -w option for rpmbuild

[packages/tcpdump.git] / tcpdump.spec

diff --git a/tcpdump.spec b/tcpdump.spec
index f09188b9cd52f9fdc3cb9a869fd8c80def6dfa65..a6e0cc77ad5a350138e678919d0df6979e3b1cb0 100644 (file)
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -1,7 +1,8 @@
 #
 # Conditional build:
 %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
@@ -12,21 +13,26 @@ 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.0.0
-Release:       1
+Version:       4.2.0
+Release:       6
 Epoch:         1
 License:       BSD
-Group:         Applications/Networking
+Group:         Networking/Utilities
 Source0:       http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: b22ca72890df2301d922c9f2d17867f9
+# Source0-md5: 0296d4c487c3a156879783643704bd39
+Patch0:                libpcap-m4.patch
+Patch1:                %{name}-ppi.patch
 URL:           http://www.tcpdump.org/
-BuildRequires: automake
-BuildRequires: libpcap-devel >= 2:1.0.0
+BuildRequires: autoconf
+BuildRequires: libpcap-devel >= 2:1.2.0
 %{?with_libsmi:BuildRequires:  libsmi-devel}
 BuildRequires: openssl-devel >= 0.9.7d
-# beware of tar 1.13.9[12] madness (tarball contains tcpdump-3.8.3/./* paths)
-BuildRequires: tar >= 1:1.13.93
-Requires:      libpcap >= 2:0.9.8
+BuildRequires: rpmbuild(macros) >= 1.202
+Requires:      libpcap >= 2:1.2.0
+Provides:      user(tcpdump)
+Requires(postun):      /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/useradd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -72,19 +78,36 @@ Tcpdump виводить хедери пакетів, що проходять ч
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-cp -f /usr/share/automake/config.* .
+%{__autoconf}
 %configure \
+       CFLAGS="-I. %{rpmcflags} %{rpmcppflags}" \
+       %{?with_smi:--with-smi} \
+%if %{with drop_priv}
+       --with-user=tcpdump \
+       --with-chroot=/usr/share/empty \
+%endif
        --enable-ipv6
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/tcpdump.%{version}
+
+%pre
+%useradd -u 273 -r -d /usr/share/empty -s /bin/false -c "tcpdump User" -g nobody tcpdump
+
+%postun
+if [ "$1" = "0" ]; then
+       %userremove tcpdump
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -92,4 +115,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc CHANGES CREDITS LICENSE README
 %attr(755,root,root) %{_sbindir}/tcpdump
-%{_mandir}/man1/*
+%{_mandir}/man1/tcpdump.1*