From 90cd79475be1d72ce58666c256e4e7fd549a45a7 Mon Sep 17 00:00:00 2001
From: Paul P Komkoff Jr <stingray@fedoraproject.org>
Date: Wed, 16 Jul 2008 21:15:30 +0000
Subject: [PATCH] new upstream version

---
 .cvsignore                          |  2 +-
 libnetfilter_queue-linuxtypes.patch | 12 ------------
 libnetfilter_queue-sysheader.patch  |  6 +++---
 libnetfilter_queue.spec             | 15 ++++++---------
 sources                             |  2 +-
 5 files changed, 11 insertions(+), 26 deletions(-)
 delete mode 100644 libnetfilter_queue-linuxtypes.patch

diff --git a/.cvsignore b/.cvsignore
index fc77097..8fd8ba8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libnetfilter_queue-0.0.15.tar.bz2
+libnetfilter_queue-0.0.16.tar.bz2
diff --git a/libnetfilter_queue-linuxtypes.patch b/libnetfilter_queue-linuxtypes.patch
deleted file mode 100644
index 372b600..0000000
--- a/libnetfilter_queue-linuxtypes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c
-index af224de..be72974 100644
---- a/utils/nfqnl_test.c
-+++ b/utils/nfqnl_test.c
-@@ -3,6 +3,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <netinet/in.h>
-+#include <linux/types.h>
- #include <linux/netfilter.h>		/* for NF_ACCEPT */
- 
- #include <libnetfilter_queue/libnetfilter_queue.h>
diff --git a/libnetfilter_queue-sysheader.patch b/libnetfilter_queue-sysheader.patch
index 8951bd2..7ba17ba 100644
--- a/libnetfilter_queue-sysheader.patch
+++ b/libnetfilter_queue-sysheader.patch
@@ -8,7 +8,7 @@ index b0f214b..fc9a2f6 100644
 +pkginclude_HEADERS = libnetfilter_queue.h libipq.h
  
 diff --git a/include/libnetfilter_queue/libnetfilter_queue.h b/include/libnetfilter_queue/libnetfilter_queue.h
-index 6695c3d..fafcc18 100644
+index 1a72c51..df9bd72 100644
 --- a/include/libnetfilter_queue/libnetfilter_queue.h
 +++ b/include/libnetfilter_queue/libnetfilter_queue.h
 @@ -14,9 +14,12 @@
@@ -24,8 +24,8 @@ index 6695c3d..fafcc18 100644
 +
 +#include <linux/netfilter/nfnetlink_queue.h>
  
- struct nfq_handle;
- struct nfq_q_handle;
+ #ifdef __cplusplus
+ extern "C" {
 diff --git a/include/libnetfilter_queue/linux_nfnetlink_queue.h b/include/libnetfilter_queue/linux_nfnetlink_queue.h
 deleted file mode 100644
 index 191b094..0000000
diff --git a/libnetfilter_queue.spec b/libnetfilter_queue.spec
index 6618920..7dfc936 100644
--- a/libnetfilter_queue.spec
+++ b/libnetfilter_queue.spec
@@ -1,13 +1,12 @@
 Name:           libnetfilter_queue
-Version:        0.0.15
-Release:        4%{?dist}
+Version:        0.0.16
+Release:        1%{?dist}
 Summary:        Netfilter queue userspace library
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://netfilter.org
 Source0:        http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2
-Patch0:		libnetfilter_queue-linuxtypes.patch
-Patch1:		libnetfilter_queue-sysheader.patch
+Patch0:		libnetfilter_queue-sysheader.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libnfnetlink-devel, pkgconfig, kernel-headers
@@ -36,17 +35,12 @@ libnetfilter_queue has been previously known as libnfnetlink_queue.
 %prep
 %setup -q
 %patch -p1
-%patch1 -p1
 
 autoreconf -i --force
 
 %build
 %configure --disable-static --disable-rpath
 
-# kill the rpaths
-#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 make %{?_smp_mflags}
 
 %install
@@ -73,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Jul 16 2008 Paul P. Komkoff Jr <i@stingr.net> - 0.0.16-1
+- new upstream version
+
 * Fri Feb 22 2008 Paul P Komkoff Jr <i@stingr.net> - 0.0.15-4
 - use system header instead of bundled one
 
diff --git a/sources b/sources
index 11bc81d..955ab81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8602566c253a9114b19a8b77980d808  libnetfilter_queue-0.0.15.tar.bz2
+b36664e6cd39edbfe46b416a86118add  libnetfilter_queue-0.0.16.tar.bz2