Author: glen                         Date: Thu Apr  1 11:55:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add m4 and ac patches, build snow with libpcap 1.0.0 as well

---- Files affected:
packages/tcpdump:
   tcpdump.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: packages/tcpdump/tcpdump.spec
diff -u packages/tcpdump/tcpdump.spec:1.80 packages/tcpdump/tcpdump.spec:1.81
--- packages/tcpdump/tcpdump.spec:1.80  Thu Apr  1 13:36:26 2010
+++ packages/tcpdump/tcpdump.spec       Thu Apr  1 13:55:53 2010
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_without libsmi  # Build without SMI support
-#
+
 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
@@ -20,12 +20,14 @@
 Group:         Applications/Networking
 Source0:       http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 # Source0-md5: 949d4661a7501cfedf7b1eb858302c9c
+Patch0:                libpcap-m4.patch
+Patch1:                %{name}-ac.patch
 URL:           http://www.tcpdump.org/
 BuildRequires: automake
-BuildRequires: libpcap-devel >= 2:1.1.0
+BuildRequires: libpcap-devel >= 2:1.0.0
 %{?with_libsmi:BuildRequires:  libsmi-devel}
 BuildRequires: openssl-devel >= 0.9.7d
-Requires:      libpcap >= 2:1.1.0
+Requires:      libpcap >= 2:1.0.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -71,9 +73,11 @@
 
 %prep
 %setup -q -n %{name}-4.1
+%patch0 -p1
+%patch1 -p1
 
 %build
-cp -f /usr/share/automake/config.* .
+%{__autoconf}
 %configure \
        --enable-ipv6
 %{__make}
@@ -84,6 +88,8 @@
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+rm $RPM_BUILD_ROOT%{_sbindir}/tcpdump.4.1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -91,7 +97,7 @@
 %defattr(644,root,root,755)
 %doc CHANGES CREDITS LICENSE README
 %attr(755,root,root) %{_sbindir}/tcpdump
-%{_mandir}/man1/*
+%{_mandir}/man1/tcpdump.1*
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -99,6 +105,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2010/04/01 11:55:53  glen
+- add m4 and ac patches, build snow with libpcap 1.0.0 as well
+
 Revision 1.80  2010/04/01 11:36:26  glen
 - up to 4.1.0, likely needs libpcap 1.1
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tcpdump/tcpdump.spec?r1=1.80&r2=1.81&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to