[libnetfilter_log] Update to 1.0.0. Remove autoconf dependency.
Paul P Komkoff Jr
stingray at fedoraproject.org
Wed Nov 3 14:53:52 UTC 2010
commit c9b273ea1774a774d1658b8080ea8c1a8ee1ac71
Author: Paul P. Komkoff Jr <i at stingr.net>
Date: Wed Nov 3 15:43:37 2010 +0300
Update to 1.0.0.
Remove autoconf dependency.
libnetfilter_log-sysheader.patch | 53 +++++++++++++++++++++----------------
libnetfilter_log.spec | 14 +++++----
2 files changed, 38 insertions(+), 29 deletions(-)
---
diff --git a/libnetfilter_log-sysheader.patch b/libnetfilter_log-sysheader.patch
index d9890ef..dc847e1 100644
--- a/libnetfilter_log-sysheader.patch
+++ b/libnetfilter_log-sysheader.patch
@@ -1,16 +1,6 @@
-diff --git a/include/libnetfilter_log/Makefile.am b/include/libnetfilter_log/Makefile.am
-index fe934f1..7c026fe 100644
---- a/include/libnetfilter_log/Makefile.am
-+++ b/include/libnetfilter_log/Makefile.am
-@@ -1,3 +1 @@
--
--pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h
--
-+pkginclude_HEADERS = libnetfilter_log.h libipulog.h
-diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h
-index aa0da72..f18929b 100644
---- a/include/libnetfilter_log/libnetfilter_log.h
-+++ b/include/libnetfilter_log/libnetfilter_log.h
+diff -urN libnetfilter_log-1.0.0/include/libnetfilter_log/libnetfilter_log.h libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/libnetfilter_log.h
+--- libnetfilter_log-1.0.0/include/libnetfilter_log/libnetfilter_log.h 2010-11-03 15:39:00.000000000 +0300
++++ libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/libnetfilter_log.h 2010-11-03 15:36:09.000000000 +0300
@@ -9,7 +9,11 @@
#ifndef __LIBNETFILTER_LOG_H
#define __LIBNETFILTER_LOG_H
@@ -24,11 +14,9 @@ index aa0da72..f18929b 100644
struct nflog_handle;
struct nflog_g_handle;
-diff --git a/include/libnetfilter_log/linux_nfnetlink_log.h b/include/libnetfilter_log/linux_nfnetlink_log.h
-deleted file mode 100644
-index 4c802c8..0000000
---- a/include/libnetfilter_log/linux_nfnetlink_log.h
-+++ /dev/null
+diff -urN libnetfilter_log-1.0.0/include/libnetfilter_log/linux_nfnetlink_log.h libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/linux_nfnetlink_log.h
+--- libnetfilter_log-1.0.0/include/libnetfilter_log/linux_nfnetlink_log.h 2010-11-03 15:39:00.000000000 +0300
++++ libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/linux_nfnetlink_log.h 1970-01-01 03:00:00.000000000 +0300
@@ -1,102 +0,0 @@
-#ifndef _NFNETLINK_LOG_H
-#define _NFNETLINK_LOG_H
@@ -132,11 +120,30 @@ index 4c802c8..0000000
-#define NFULNL_CFG_F_SEQ_GLOBAL 0x0002
-
-#endif /* _NFNETLINK_LOG_H */
-diff --git a/src/libnetfilter_log.c b/src/libnetfilter_log.c
-index 6c0936e..bb6876c 100644
---- a/src/libnetfilter_log.c
-+++ b/src/libnetfilter_log.c
-@@ -26,8 +26,6 @@
+diff -urN libnetfilter_log-1.0.0/include/libnetfilter_log/Makefile.am libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/Makefile.am
+--- libnetfilter_log-1.0.0/include/libnetfilter_log/Makefile.am 2010-11-03 15:39:00.000000000 +0300
++++ libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/Makefile.am 2010-11-03 15:36:09.000000000 +0300
+@@ -1,3 +1 @@
+-
+-pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h
+-
++pkginclude_HEADERS = libnetfilter_log.h libipulog.h
+diff -urN libnetfilter_log-1.0.0/include/libnetfilter_log/Makefile.in libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/Makefile.in
+--- libnetfilter_log-1.0.0/include/libnetfilter_log/Makefile.in 2010-11-03 15:39:26.000000000 +0300
++++ libnetfilter_log-1.0.0-noheader/include/libnetfilter_log/Makefile.in 2010-11-03 15:36:42.000000000 +0300
+@@ -196,7 +196,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h
++pkginclude_HEADERS = libnetfilter_log.h libipulog.h
+ all: all-am
+
+ .SUFFIXES:
+diff -urN libnetfilter_log-1.0.0/src/libnetfilter_log.c libnetfilter_log-1.0.0-noheader/src/libnetfilter_log.c
+--- libnetfilter_log-1.0.0/src/libnetfilter_log.c 2010-11-03 15:39:00.000000000 +0300
++++ libnetfilter_log-1.0.0-noheader/src/libnetfilter_log.c 2010-11-03 15:36:09.000000000 +0300
+@@ -27,8 +27,6 @@
#include <netinet/in.h>
#include <sys/socket.h>
diff --git a/libnetfilter_log.spec b/libnetfilter_log.spec
index b157e5d..73f16d2 100644
--- a/libnetfilter_log.spec
+++ b/libnetfilter_log.spec
@@ -1,8 +1,8 @@
-%define libnfnetlink 0.0.41
+%define libnfnetlink 1.0.0
Name: libnetfilter_log
-Version: 0.0.16
-Release: 3%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
Summary: Netfilter logging userspace library
Group: System Environment/Libraries
License: GPLv2
@@ -12,7 +12,6 @@ Patch0: libnetfilter_log-sysheader.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libnfnetlink-devel >= %{libnfnetlink}, pkgconfig, kernel-headers
-BuildRequires: autoconf, automake, libtool
%description
libnetfilter_log is a userspace library providing interface to packets that
@@ -41,10 +40,10 @@ libnetfilter_log is used by ulogd2.
%setup -q
%patch0 -p1
-autoreconf -i --force
-
%build
%configure --disable-static --disable-rpath
+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}
@@ -73,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Wed Nov 3 2010 Paul P. Komkoff Jr <i at stingr.net> - 1.0.0-1
+- upstream release
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list