From b60dffc7e908851fb472c29feea08484008f2139 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 13:24:18 +0000
Subject: [PATCH] auto-import changelog data from tcpdump-3.8.2-4.src.rpm Wed
 Jun 23 2004 Elliot Lee <sopwith@redhat.com> - added flex to BuildRequires Tue
 Jun 15 2004 Elliot Lee <sopwith@redhat.com> - rebuilt Sun May 30 2004 Florian
 La Roche <Florian.LaRoche@redhat.de> - simplify rpm scripts

---
 tcpdump.spec | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/tcpdump.spec b/tcpdump.spec
index 364fe8f..56aa9a6 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -2,8 +2,8 @@
 %define PCAP_UID 77
 %define PCAP_GID 77
 
-%define releaseno 3
-%define arpwatch_release 1
+%define releaseno 4
+%define arpwatch_release %{releaseno}
 %define pcap_release %{releaseno}
 %define tcpdump_release %{releaseno}
 
@@ -55,7 +55,7 @@ Patch70: tcpslice-CVS.20010207-bpf.patch
 
 
 Prefix: %{_prefix}
-BuildRequires: kernel-headers >= 2.2.0 openssl-devel
+BuildRequires: kernel-headers >= 2.2.0 openssl-devel flex
 Requires: kernel >= 2.2.0
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -236,18 +236,20 @@ popd
 rm -rf ${RPM_BUILD_ROOT}
 
 %pre
-/usr/sbin/groupadd -g %{PCAP_GID} pcap  2> /dev/null || :
-/usr/sbin/useradd -u %{PCAP_UID} -g %{PCAP_GID} \
-        -s /sbin/nologin -M -r -d %{_vararpwatch} pcap 2> /dev/null || ( /usr/bin/chsh pcap /sbin/nologin 2> /dev/null || : )
+/usr/sbin/groupadd -g %{PCAP_GID} pcap  2> /dev/null
+/usr/sbin/useradd -u %{PCAP_UID} -g %{PCAP_GID} -s /sbin/nologin -M -r \
+	-d %{_vararpwatch} pcap 2> /dev/null \
+	|| /usr/bin/chsh pcap /sbin/nologin 2> /dev/null
 exit 0
 
 %post -n arpwatch
 /sbin/chkconfig --add arpwatch
 
 %pre -n arpwatch
-/usr/sbin/groupadd -g %{PCAP_GID} pcap  2> /dev/null || :
+/usr/sbin/groupadd -g %{PCAP_GID} pcap  2> /dev/null
 /usr/sbin/useradd -u %{PCAP_UID} -g %{PCAP_GID} \
-        -s /sbin/nologin -M -r -d %{_vararpwatch} pcap 2> /dev/null || ( /usr/bin/chsh pcap /sbin/nologin 2> /dev/null || : )
+	-s /sbin/nologin -M -r -d %{_vararpwatch} pcap 2> /dev/null \
+	|| /usr/bin/chsh pcap /sbin/nologin 2> /dev/null
 exit 0
 
 %postun -n arpwatch
@@ -255,9 +257,10 @@ exit 0
 
 %preun -n arpwatch
 if [ "$1" = "0" ]; then
-	/sbin/service arpwatch stop > /dev/null 2>&1 || :
-	/sbin/chkconfig --del arpwatch || :
+	/sbin/service arpwatch stop > /dev/null 2>&1
+	/sbin/chkconfig --del arpwatch
 fi
+exit 0
 
 %post -n libpcap -p /sbin/ldconfig
 
@@ -299,6 +302,15 @@ fi
 %{_vararpwatch}/massagevendor-old
 
 %changelog
+* Wed Jun 23 2004 Elliot Lee <sopwith@redhat.com>
+- added flex to BuildRequires
+
+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Sun May 30 2004 Florian La Roche <Florian.LaRoche@redhat.de>
+- simplify rpm scripts
+
 * Tue Apr  6 2004 Harald Hoyer <harald@redhat.com> - 14:3.8.2-3
 - added LICENSE files