rpms/libnetfilter_queue/F-9 .cvsignore, 1.3, 1.4 libnetfilter_queue-sysheader.patch, 1.1, 1.2 libnetfilter_queue.spec, 1.5, 1.6 sources, 1.3, 1.4 libnetfilter_queue-linuxtypes.patch, 1.1, NONE

[Paul P Komkoff Jr]

Author: stingray

Update of /cvs/extras/rpms/libnetfilter_queue/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11647

Modified Files:
	.cvsignore libnetfilter_queue-sysheader.patch 
	libnetfilter_queue.spec sources 
Removed Files:
	libnetfilter_queue-linuxtypes.patch 
Log Message:
libnetfilter_queue-0.0.16


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Sep 2007 22:16:47 -0000	1.3
+++ .cvsignore	26 Oct 2008 16:39:10 -0000	1.4
@@ -1 +1 @@
-libnetfilter_queue-0.0.15.tar.bz2
+libnetfilter_queue-0.0.16.tar.bz2

libnetfilter_queue-sysheader.patch:

Index: libnetfilter_queue-sysheader.patch
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/F-9/libnetfilter_queue-sysheader.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnetfilter_queue-sysheader.patch	23 Feb 2008 00:24:21 -0000	1.1
+++ libnetfilter_queue-sysheader.patch	26 Oct 2008 16:39:10 -0000	1.2
@@ -8,7 +8,7 @@
 +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 @@
 +
 +#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


Index: libnetfilter_queue.spec
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/F-9/libnetfilter_queue.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libnetfilter_queue.spec	23 Feb 2008 00:24:21 -0000	1.5
+++ libnetfilter_queue.spec	26 Oct 2008 16:39:10 -0000	1.6
@@ -1,16 +1,16 @@
 Name:           libnetfilter_queue
-Version:        0.0.15
-Release:        4%{?dist}
+Version:        0.0.16
+Release:        3%{?dist}
 Summary:        Netfilter queue userspace library
 Group:          System Environment/Libraries
-License:        GPL
+# Most files say GPLv2+, one says v2 only.
+License:        GPLv2
 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
+BuildRequires:  libnfnetlink-devel >= 0.0.38, pkgconfig, kernel-headers
 BuildRequires:  autoconf, automake, libtool
 
 %description
@@ -24,7 +24,7 @@
 Summary:        Netfilter queue userspace library
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}, pkgconfig
-Requires:	libnfnetlink-devel, kernel-headers
+Requires:	libnfnetlink-devel >= 0.0.38, kernel-headers
 
 %description    devel
 libnetfilter_queue is a userspace library providing an API to packets that have
@@ -35,18 +35,13 @@
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p1
+%patch0 -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 +68,16 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sun Oct 26 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.0.16-3
+- fix patch/patch0
+- depend on specific libnfnetlink version
+
+* Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.0.16-2
+- fix license tag
+
+* Wed Jul 16 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.0.16-1
+- new upstream version
+
 * Fri Feb 22 2008 Paul P Komkoff Jr <i at stingr.net> - 0.0.15-4
 - use system header instead of bundled one
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Sep 2007 22:16:47 -0000	1.3
+++ sources	26 Oct 2008 16:39:10 -0000	1.4
@@ -1 +1 @@
-d8602566c253a9114b19a8b77980d808  libnetfilter_queue-0.0.15.tar.bz2
+b36664e6cd39edbfe46b416a86118add  libnetfilter_queue-0.0.16.tar.bz2


--- libnetfilter_queue-linuxtypes.patch DELETED ---