forked from pool/iptables
Put include files into a separate directory
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=26
This commit is contained in:
Git OBS Bridge
parent
e9ca75a855
commit
f8b3b70a20
71
4982fe4-libipq-pkgconfig.diff
Normal file
71
4982fe4-libipq-pkgconfig.diff
Normal file
@ -0,0 +1,71 @@
|
||||
parent fa2ce1ca2a3448350dee30c153dafe65abe7135d (v1.4.11.1-37-gfa2ce1c)
|
||||
commit 4982fe43cf247cda6ddb946a8f1fd58177124735
|
||||
Author: Jan Engelhardt <jengelh@medozas.de>
|
||||
Date: Mon Aug 8 02:38:41 2011 +0200
|
||||
|
||||
libipq: add pkgconfig file
|
||||
|
||||
This is just to make sure that projects (still) using it do so with
|
||||
the right cflags, e.g. for when the include file ends up in a
|
||||
non-standard location due to ./configure having been called with
|
||||
--include=/somewhere/else.
|
||||
|
||||
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
||||
---
|
||||
configure.ac | 3 ++-
|
||||
libipq/.gitignore | 1 +
|
||||
libipq/Makefile.am | 2 ++
|
||||
libipq/libipq.pc.in | 11 +++++++++++
|
||||
4 files changed, 16 insertions(+), 1 deletions(-)
|
||||
create mode 100644 libipq/.gitignore
|
||||
create mode 100644 libipq/libipq.pc.in
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 6aa0b2a..ab824a4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -111,6 +111,7 @@ AC_SUBST([libxtables_vmajor])
|
||||
|
||||
AC_CONFIG_FILES([Makefile extensions/GNUmakefile include/Makefile
|
||||
iptables/Makefile iptables/xtables.pc
|
||||
- libipq/Makefile libiptc/Makefile libiptc/libiptc.pc utils/Makefile
|
||||
+ libipq/Makefile libipq/libipq.pc
|
||||
+ libiptc/Makefile libiptc/libiptc.pc utils/Makefile
|
||||
include/xtables.h include/iptables/internal.h])
|
||||
AC_OUTPUT
|
||||
diff --git a/libipq/.gitignore b/libipq/.gitignore
|
||||
new file mode 100644
|
||||
index 0000000..6cb21a3
|
||||
--- /dev/null
|
||||
+++ b/libipq/.gitignore
|
||||
@@ -0,0 +1 @@
|
||||
+/libipq.pc
|
||||
diff --git a/libipq/Makefile.am b/libipq/Makefile.am
|
||||
index 93e5b1c..9e3a2ca 100644
|
||||
--- a/libipq/Makefile.am
|
||||
+++ b/libipq/Makefile.am
|
||||
@@ -9,3 +9,5 @@ man_MANS = ipq_create_handle.3 ipq_destroy_handle.3 ipq_errstr.3 \
|
||||
ipq_get_msgerr.3 ipq_get_packet.3 ipq_message_type.3 \
|
||||
ipq_perror.3 ipq_read.3 ipq_set_mode.3 ipq_set_verdict.3 \
|
||||
libipq.3
|
||||
+
|
||||
+pkgconfig_DATA = libipq.pc
|
||||
diff --git a/libipq/libipq.pc.in b/libipq/libipq.pc.in
|
||||
new file mode 100644
|
||||
index 0000000..ea31ec7
|
||||
--- /dev/null
|
||||
+++ b/libipq/libipq.pc.in
|
||||
@@ -0,0 +1,11 @@
|
||||
+
|
||||
+prefix=@prefix@
|
||||
+exec_prefix=@exec_prefix@
|
||||
+libdir=@libdir@
|
||||
+includedir=@includedir@
|
||||
+
|
||||
+Name: libipq
|
||||
+Description: Interface to the (old) ip_queue mechanism
|
||||
+Version: @PACKAGE_VERSION@
|
||||
+Libs: -L${libdir} -lipq
|
||||
+Cflags: -I${includedir}
|
||||
--
|
||||
# Created with git-export-patch
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 8 00:42:53 UTC 2011 - jengelh@medozas.de
|
||||
|
||||
- Put include files into a separate directory to flag up missing
|
||||
CFLAGS. libipq.pc will now be provided.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 22 13:12:50 UTC 2011 - jengelh@medozas.de
|
||||
|
||||
|
||||
@ -31,6 +31,7 @@ Summary: IP Packet Filter Administration
|
||||
Source: %name-%version.tar.xz
|
||||
Patch1: iptables-batch.patch
|
||||
Patch2: proc-header.diff
|
||||
Patch3: 4982fe4-libipq-pkgconfig.diff
|
||||
Url: http://netfilter.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version}
|
||||
@ -41,7 +42,7 @@ BuildRequires: sgml-common
|
||||
Provides: iptables-ipv6 = %version-%release
|
||||
Obsoletes: iptables-ipv6 < %version-%release
|
||||
%endif
|
||||
BuildRequires: pkgconfig, xz
|
||||
BuildRequires: fdupes, pkgconfig, xz
|
||||
|
||||
%description
|
||||
Iptables is used to set up, maintain, and inspect the tables of IP
|
||||
@ -67,7 +68,7 @@ These libraries are needed to compile
|
||||
tar -xf "%{S:0}" --use=xz;
|
||||
%setup -DTq
|
||||
%endif
|
||||
%patch -P 1 -P 2 -p1
|
||||
%patch -P 1 -P 2 -P 3 -p1
|
||||
|
||||
%build
|
||||
if [ ! -e configure ]; then
|
||||
@ -75,7 +76,7 @@ if [ ! -e configure ]; then
|
||||
fi
|
||||
# bnc#561793 - do not include unclean module in iptables manpage
|
||||
rm -f extensions/libipt_unclean.man
|
||||
%configure \
|
||||
%configure --includedir=%_includedir/%name-%version \
|
||||
--enable-libipq
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -85,6 +86,7 @@ make DESTDIR=%buildroot install
|
||||
install -m0755 iptables/iptables-apply %buildroot%_sbindir/
|
||||
install -m0644 iptables/iptables-apply.8 %buildroot%_mandir/man8/
|
||||
find "%buildroot" -iname "*.la" -delete
|
||||
%fdupes %buildroot
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
@ -107,7 +109,6 @@ find "%buildroot" -iname "*.la" -delete
|
||||
%doc %_mandir/man3/*
|
||||
%_includedir/*
|
||||
%_libdir/*.so
|
||||
%_libdir/pkgconfig/xtables.pc
|
||||
%_libdir/pkgconfig/libiptc.pc
|
||||
%_libdir/pkgconfig/*.pc
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user