From 41c2076f3763f427fad44320e32dac2787b76426 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Tue, 3 Jan 2023 16:37:46 +0800
Subject: [PATCH] rebuild for new libnfnetlink

---
 iptables.spec | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/iptables.spec b/iptables.spec
index 9aac9ff..bee7140 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,5 +1,5 @@
 # install init scripts to /usr/libexec with systemd
-%define anolis_release 2
+%define anolis_release 3
 %global script_path %{_libexecdir}/iptables
 %global legacy_actions %{_libexecdir}/initscripts/legacy-actions
 %global iptc_so_ver  0
@@ -99,7 +99,6 @@ For more information about this, please have a look at
 Summary: Development package for iptables
 Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-legacy-devel = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 libxtables development headers and pkgconfig files
@@ -107,7 +106,6 @@ libxtables development headers and pkgconfig files
 %package legacy-devel
 Summary: Development package for legacy iptables
 Requires: %{name}-legacy-libs = %{version}-%{release}
-Requires: pkgconfig
 
 %description legacy-devel
 Legacy iptables development headers and pkgconfig files
@@ -160,22 +158,15 @@ nftables compatibility for iptables, arptables and ebtables.
 %autosetup -p1
 
 %build
-./autogen.sh
 CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " \
 %configure --enable-devel --enable-bpf-compiler --with-kernel=/usr --with-kbuild=/usr --with-ksource=/usr
 
-# do not use 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
-
 rm -f include/linux/types.h
 
 %make_build
 
 %install
 %make_install
-# remove la file(s)
-rm -f %{buildroot}%{_libdir}/*.la
 
 # install init scripts and configuration files
 install -d -m 755 %{buildroot}%{script_path}
@@ -295,14 +286,14 @@ for sfx in "" "-restore" "-save"; do
 		rm -f $pfx$sfx
 	fi
 done
-if [ "$(readlink -e $manpfx.8.gz)" == $manpfx.8.gz ]; then
-	rm -f $manpfx.8.gz
+if [ "$(readlink -e $manpfx.8.zstd" == $manpfx.8.zstd ]; then
+	rm -f $manpfx.8.zstd
 fi
 %{_sbindir}/update-alternatives --install \
 	$pfx ebtables $pfx-nft 10 \
 	--slave $pfx-save ebtables-save $pfx-nft-save \
 	--slave $pfx-restore ebtables-restore $pfx-nft-restore \
-	--slave $manpfx.8.gz ebtables-man $manpfx-nft.8.gz
+	--slave $manpfx.8.zstd ebtables-man $manpfx-nft.8.zstd
 
 pfx=%{_sbindir}/arptables
 manpfx=%{_mandir}/man8/arptables
@@ -311,8 +302,8 @@ for sfx in "" "-restore" "-save"; do
 	if [ "$(readlink -e $pfx$sfx)" == $pfx$sfx ]; then
 		rm -f $pfx$sfx
 	fi
-	if [ "$(readlink -e $manpfx$sfx.8.gz)" == $manpfx$sfx.8.gz ]; then
-		rm -f $manpfx$sfx.8.gz
+	if [ "$(readlink -e $manpfx$sfx.8.zstd)" == $manpfx$sfx.8.zstd ]; then
+		rm -f $manpfx$sfx.8.zstd
 	fi
 done
 if [ "$(readlink -e $lepfx-helper)" == $lepfx-helper ]; then
@@ -322,9 +313,9 @@ fi
 	$pfx arptables $pfx-nft 10 \
 	--slave $pfx-save arptables-save $pfx-nft-save \
 	--slave $pfx-restore arptables-restore $pfx-nft-restore \
-	--slave $manpfx.8.gz arptables-man $manpfx-nft.8.gz \
-	--slave $manpfx-save.8.gz arptables-save-man $manpfx-nft-save.8.gz \
-	--slave $manpfx-restore.8.gz arptables-restore-man $manpfx-nft-restore.8.gz \
+	--slave $manpfx.8.zstd arptables-man $manpfx-nft.8.zstd \
+	--slave $manpfx-save.8.zstd arptables-save-man $manpfx-nft-save.8.zstd \
+	--slave $manpfx-restore.8.zstd arptables-restore-man $manpfx-nft-restore.8.zstd \
 	--slave $lepfx-helper arptables-helper $lepfx-nft-helper
 
 %postun nft
@@ -354,8 +345,8 @@ fi
 %dir %{_libdir}/xtables
 %{_libdir}/xtables/lib{ip,ip6,x}t*
 %{abidir}/lib{ip,ip6,x}t*.dump
-%{_mandir}/man8/ip{,6}tables.8.gz
-%{_mandir}/man8/ip{,6}tables-{extensions,save,restore}.8.gz
+%{_mandir}/man8/ip{,6}tables.8.*
+%{_mandir}/man8/ip{,6}tables-{extensions,save,restore}.8.*
 
 %files legacy-libs
 %license COPYING
@@ -410,11 +401,14 @@ fi
 %ghost %{_sbindir}/ip{,6}tables{,-save,-restore}
 %ghost %{_sbindir}/{eb,arp}tables{,-save,-restore}
 %ghost %{_libexecdir}/arptables-helper
-%ghost %{_mandir}/man8/arptables{,-save,-restore}.8.gz
-%ghost %{_mandir}/man8/ebtables.8.gz
+%ghost %{_mandir}/man8/arptables{,-save,-restore}.8.*
+%ghost %{_mandir}/man8/ebtables.8.*
 
 
 %changelog
+* Tue Jan 3 2023 Funda Wang <fundawang@yeah.net> - 1.8.8-3
+- Rebuild for new libnfnetlink
+
 * Wed Oct 26 2022 mgb01105731 <mgb01105731@alibaba-inc.com> - 1.8.8-2
 - optimise spec file
 
-- 
Gitee