[libpcap] Update to new upstream release, libpcap-1.2.0

[Michal Sekletar]

commit 07fdab966d9628170b0b9913360880836a07c733
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Fri Dec 2 07:24:06 2011 +0100

    Update to new upstream release, libpcap-1.2.0

 .gitignore             |    1 +
 libpcap-multilib.patch |   34 +++++++++++++++++-----------------
 libpcap-nodev.patch    |   36 ------------------------------------
 libpcap.spec           |   13 +++++++------
 sources                |    2 +-
 5 files changed, 26 insertions(+), 60 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ae85f60..fc4d781 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libpcap-1.1.1.tar.gz
+/libpcap-1.2.0.tar.gz
diff --git a/libpcap-multilib.patch b/libpcap-multilib.patch
index 10492d1..7eff7ed 100644
--- a/libpcap-multilib.patch
+++ b/libpcap-multilib.patch
@@ -1,61 +1,61 @@
 diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in
---- libpcap/pcap-config.in.multilib	2009-07-03 06:01:12.000000000 +0200
-+++ libpcap/pcap-config.in	2009-07-09 15:55:48.000000000 +0200
-@@ -29,16 +29,6 @@ do
+--- libpcap/pcap-config.in.multilib	2011-11-23 14:28:54.580396515 +0100
++++ libpcap/pcap-config.in	2011-11-23 14:36:47.408268484 +0100
+@@ -36,16 +36,6 @@ do
  	esac
  	shift
  done
--if [ "@V_RPATH_OPT@" != "" ]
+-if [ "$V_RPATH_OPT" != "" ]
 -then
 -	#
 -	# If libdir isn't /usr/lib, add it to the run-time linker path.
 -	#
--	if [ "@libdir@" != "/usr/lib" ]
+-	if [ "$libdir" != "/usr/lib" ]
 -	then
--		RPATH=@V_RPATH_OPT@@libdir@
+-		RPATH=$V_RPATH_OPT$libdir
 -	fi
 -fi
  if [ "$static" = 1 ]
  then
  	#
-@@ -47,16 +37,16 @@ then
+@@ -54,16 +44,16 @@ then
  	#
  	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
  	then
--		echo "-I at includedir@ -L at libdir@ -lpcap @LIBS@"
+-		echo "-I$includedir -L$libdir -lpcap $LIBS"
 +		echo "-lpcap @LIBS@"
  	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
  	then
--		echo "-I at includedir@ -L at libdir@ @LIBS@"
+-		echo "-I$includedir -L$libdir $LIBS"
 +		echo "@LIBS@"
  	elif [ "$show_cflags" = 1 ]
  	then
--		echo "-I at includedir@"
+-		echo "-I$includedir"
 +		echo ""
  	elif [ "$show_libs" = 1 ]
  	then
--		echo "-L at libdir@ -lpcap @LIBS@"
+-		echo "-L$libdir -lpcap $LIBS"
 +		echo "-lpcap @LIBS@"
  	elif [ "$show_additional_libs" = 1 ]
  	then
- 		echo "@LIBS@"
-@@ -68,15 +58,15 @@ else
+ 		echo "$LIBS"
+@@ -75,15 +65,15 @@ else
  	#
  	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
  	then
--		echo "-I at includedir@ -L at libdir@ $RPATH -lpcap"
+-		echo "-I$includedir -L$libdir $RPATH -lpcap"
 +		echo "-lpcap"
  	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
  	then
--		echo "-I at includedir@"
+-		echo "-I$includedir"
 +		echo ""
  	elif [ "$show_cflags" = 1 ]
  	then
--		echo "-I at includedir@"
+-		echo "-I$includedir"
 +		echo ""
  	elif [ "$show_libs" = 1 ]
  	then
--		echo "-L at libdir@ $RPATH -lpcap"
+-		echo "-L$libdir $RPATH -lpcap"
 +		echo "-lpcap"
  	fi
  fi
diff --git a/libpcap.spec b/libpcap.spec
index 0d40617..711ea30 100644
--- a/libpcap.spec
+++ b/libpcap.spec
@@ -1,7 +1,7 @@
 Name: libpcap
 Epoch: 14
-Version: 1.1.1
-Release: 4%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 Summary: A system-independent interface for user-level packet capture
 Group: Development/Libraries
 License: BSD with advertising
@@ -13,8 +13,7 @@ Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 Patch1: libpcap-man.patch
 Patch2: libpcap-multilib.patch
 Patch3: libpcap-s390.patch
-Patch4: libpcap-nodev.patch
-Patch5: libpcap-fragment.patch
+Patch4: libpcap-fragment.patch
 
 %description
 Libpcap provides a portable framework for low-level network
@@ -51,8 +50,7 @@ resources needed for developing libpcap applications.
 %patch1 -p1 -b .man 
 %patch2 -p1 -b .multilib
 %patch3 -p1 -b .s390
-%patch4 -p1 -b .nodev
-%patch5 -p1 -b .fragment
+%patch4 -p1 -b .fragment
 
 #sparc needs -fPIC 
 %ifarch %{sparc}
@@ -94,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/pcap*.5*
 
 %changelog
+* Fri Dec 02 2011 Michal Sekletar <msekleta at redhat.com> 14:1.2.0-1
+- update to 1.2.0
+
 * Tue Sep 06 2011 Michal Sekletar <msekleta at redhat.com> 14:1.1.1-4
 - fix capture of fragmented ipv6 packets
 
diff --git a/sources b/sources
index c1b7505..f3ba2a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1bca27d206970badae248cfa471bbb47  libpcap-1.1.1.tar.gz
+dfb8aa690b7a29821bfa183025436569  libpcap-1.2.0.tar.gz