From 3974bc506c41e7ec087f1c50be334168506da0e2 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Sep 23 2009 16:13:38 +0000
Subject: - update to snapshot 20090922gite154e2

- drop old soname

---

diff --git a/.cvsignore b/.cvsignore
index 1b34f8e..8d1a50f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libpcap-20090716git6de2de.tar.gz
+libpcap-1.0.0-20090922gite154e2.tar.bz2
diff --git a/libpcap-oldsoname.patch b/libpcap-oldsoname.patch
deleted file mode 100644
index 5a25506..0000000
--- a/libpcap-oldsoname.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up libpcap/Makefile.in.oldsoname libpcap/Makefile.in
---- libpcap/Makefile.in.oldsoname	2009-07-17 00:10:42.000000000 +0200
-+++ libpcap/Makefile.in	2009-07-22 15:53:32.000000000 +0200
-@@ -328,6 +328,8 @@ libpcap.so: $(OBJ)
- 	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
- 	@V_SHLIB_CMD@ @V_SHLIB_OPT@ @V_SONAME_OPT@$@.$$MAJOR_VER $(LDFLAGS) \
- 	    -o $@.$$VER $(OBJ) $(ADDLOBJS) $(LIBS)
-+	@V_SHLIB_CMD@ @V_SHLIB_OPT@ @V_SONAME_OPT@$@.0.9 $(LDFLAGS) \
-+	    -o $@.0.9.9 $(OBJ) $(ADDLOBJS) $(LIBS)
- 
- #
- # The following rule succeeds, but the result is untested.
-@@ -542,6 +544,8 @@ install-shared-so: libpcap.so
- 	VER=`cat $(srcdir)/VERSION`; \
- 	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
- 	$(INSTALL_PROGRAM) libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$VER; \
-+	$(INSTALL_PROGRAM) libpcap.so.0.9.9 $(DESTDIR)$(libdir)/libpcap.so.0.9.9; \
-+	ln -sf libpcap.so.0.9.9 $(DESTDIR)$(libdir)/libpcap.so.0.9; \
- 	ln -sf libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$MAJOR_VER; \
- 	ln -sf libpcap.so.$$MAJOR_VER $(DESTDIR)$(libdir)/libpcap.so
- install-shared-dylib: libpcap.dylib
diff --git a/libpcap-oneshot.patch b/libpcap-oneshot.patch
deleted file mode 100644
index f1db525..0000000
--- a/libpcap-oneshot.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libpcap/pcap-linux.c.oneshot libpcap/pcap-linux.c
---- libpcap/pcap-linux.c.oneshot	2009-07-17 00:10:42.000000000 +0200
-+++ libpcap/pcap-linux.c	2009-07-22 14:30:52.000000000 +0200
-@@ -2744,7 +2744,7 @@ static void
- pcap_oneshot_mmap(u_char *user, const struct pcap_pkthdr *h,
-     const u_char *bytes)
- {
--	struct pkt_for_oneshot *sp = (struct pkt_for_oneshot *)user;
-+	struct oneshot_userdata *sp = (struct oneshot_userdata *)user;
- 	bpf_u_int32 copylen;
- 
- 	*sp->hdr = *h;
diff --git a/libpcap.spec b/libpcap.spec
index f8c63d6..b5144d2 100644
--- a/libpcap.spec
+++ b/libpcap.spec
@@ -1,7 +1,7 @@
 Name: libpcap
 Epoch: 14
 Version: 1.0.0
-Release: 2.20090716git6de2de%{?dist}
+Release: 3.20090922gite154e2%{?dist}
 Summary: A system-independent interface for user-level packet capture
 Group: Development/Libraries
 License: BSD with advertising
@@ -10,14 +10,11 @@ BuildRequires: glibc-kernheaders >= 2.2.0 bison flex bluez-libs-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 # git snapshot from git://bpf.tcpdump.org/libpcap
-Source: libpcap-20090716git6de2de.tar.gz
+Source: libpcap-1.0.0-20090922gite154e2.tar.bz2
 Patch1: libpcap-man.patch
 Patch2: libpcap-multilib.patch
 Patch3: libpcap-s390.patch
 Patch4: libpcap-0.8.3-ppp.patch
-Patch5: libpcap-oneshot.patch
-# temporarily provide old soname
-Patch6: libpcap-oldsoname.patch
 
 %description
 Libpcap provides a portable framework for low-level network
@@ -56,8 +53,6 @@ echo '1.0.0' > VERSION
 %patch2 -p1 -b .multilib
 %patch3 -p1 -b .s390
 %patch4 -p0 -b .ppp
-%patch5 -p1 -b .oneshot
-%patch6 -p1 -b .oldsoname
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)"
@@ -94,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/pcap*.5*
 
 %changelog
+* Wed Sep 23 2009 Miroslav Lichvar <mlichvar@redhat.com> 14:1.0.0-1.20090922gite154e2
+- update to snapshot 20090922gite154e2
+- drop old soname
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14:1.0.0-2.20090716git6de2de
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 1b9ff27..6aa78e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac6459eb882d4e1107f8c351eb0131eb  libpcap-20090716git6de2de.tar.gz
+e7921eaa6eb247b696c1d6640c39f86c  libpcap-1.0.0-20090922gite154e2.tar.bz2