libnetfilter_conntrack-1.0.2-1

This commit is contained in:
Paul P. Komkoff 2012-11-30 04:14:48 +04:00
parent 8d9a88dea1
commit a807b22357
4 changed files with 9 additions and 32 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ libnetfilter_conntrack-0.0.101.tar.bz2
/libnetfilter_conntrack-0.9.1.tar.bz2
/libnetfilter_conntrack-1.0.0.tar.bz2
/libnetfilter_conntrack-1.0.1.tar.bz2
/libnetfilter_conntrack-1.0.2.tar.bz2

View File

@ -1,25 +0,0 @@
diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h
index a043f91..6c142a7 100644
--- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h
+++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h
@@ -9,7 +9,7 @@
#define _LIBNETFILTER_CONNTRACK_H_
#include <netinet/in.h>
-#include <libnfnetlink/linux_nfnetlink.h>
+#include <linux/netfilter/nfnetlink.h>
#include <libnfnetlink/libnfnetlink.h>
#include <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
diff --git a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
index 3b2d869..97ec29c 100644
--- a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
+++ b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
@@ -1,6 +1,6 @@
#ifndef _IPCONNTRACK_NETLINK_H
#define _IPCONNTRACK_NETLINK_H
-#include <libnfnetlink/linux_nfnetlink.h>
+#include <linux/netfilter/nfnetlink.h>
#ifdef __cplusplus
extern "C" {

View File

@ -1,15 +1,14 @@
Name: libnetfilter_conntrack
Version: 1.0.1
Release: 2%{?dist}
Version: 1.0.2
Release: 1%{?dist}
Summary: Netfilter conntrack userspace library
Group: System Environment/Libraries
License: GPLv2+
URL: http://netfilter.org
Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2
Patch0: libnetfilter_conntrack-sysheader.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libnfnetlink-devel >= 1.0.0, pkgconfig, kernel-headers
BuildRequires: libnfnetlink-devel >= 1.0.1, pkgconfig, kernel-headers, libmnl-devel >= 1.0.3
%description
libnetfilter_conntrack is a userspace library providing a programming
@ -18,7 +17,7 @@ interface (API) to the in-kernel connection tracking state table.
%package devel
Summary: Netfilter conntrack userspace library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, libnfnetlink-devel >= 1.0.0
Requires: %{name} = %{version}-%{release}, libnfnetlink-devel >= 1.0.1
Requires: kernel-headers
%description devel
@ -27,7 +26,6 @@ interface (API) to the in-kernel connection tracking state table.
%prep
%setup -q
%patch0 -p1
%build
%configure --disable-static --disable-rpath
@ -58,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/libnetfilter_conntrack/*.h
%changelog
* Fri Nov 30 2012 aul P. Komkoff Jr <i@stingr.net> - 1.0.2-1
- new upstream version
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

View File

@ -1 +1 @@
2d17d9da1404728d61a29b4a8338ad0c libnetfilter_conntrack-1.0.1.tar.bz2
447114b5d61bb9a9617ead3217c3d3ff libnetfilter_conntrack-1.0.2.tar.bz2