From c4bd1fda826a34460e0fb016008ecc32fe3ca017 Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Wed, 3 Jul 2024 15:18:39 +0200
Subject: [PATCH] iptables-1.8.10-4.el9

* Wed Jul 03 2024 Phil Sutter <psutter@redhat.com> [1.8.10-4.el9]
- spec: Simplify legacy package integration (Phil Sutter) [RHEL-5797]
Resolves: RHEL-5797
---
 iptables.spec | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/iptables.spec b/iptables.spec
index 1bfa602..dfe8685 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,5 +1,5 @@
 %define iptables_rpmversion 1.8.10
-%define iptables_specrelease 3
+%define iptables_specrelease 4
 
 # install init scripts to /usr/libexec with systemd
 %global script_path %{_libexecdir}/iptables
@@ -386,7 +386,6 @@ fi
 %if %{do_legacy_pkg}
 
 %files legacy
-%doc INCOMPATIBILITIES
 %{_sbindir}/ip{,6}tables-legacy*
 %{_sbindir}/xtables-legacy-multi
 %{_bindir}/iptables-xml
@@ -405,9 +404,15 @@ fi
 %{_libdir}/pkgconfig/libip{,4,6}tc.pc
 
 %files services
+%dir %{script_path}
+%{script_path}/ip{,6}tables.init
+%config(noreplace) %{_sysconfdir}/sysconfig/ip{,6}tables{,-config}
+%{_unitdir}/ip{,6}tables.service
+%dir %{legacy_actions}/ip{,6}tables
+%{legacy_actions}/ip{,6}tables/{save,panic}
 
 # do_legacy_pkg
-%else
+%endif
 
 %files nft-services
 %{_unitdir}/{arp,eb}tables.service
@@ -415,11 +420,6 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/ebtables-config
 %ghost %{_sysconfdir}/sysconfig/arptables
 %ghost %{_sysconfdir}/sysconfig/ebtables
-
-# do_legacy_pkg
-%endif
-
-# the common files in services and nft-services
 %dir %{script_path}
 %{script_path}/ip{,6}tables.init
 %config(noreplace) %{_sysconfdir}/sysconfig/ip{,6}tables{,-config}
@@ -472,6 +472,9 @@ fi
 %ghost %{_mandir}/man8/ebtables{,-translate}.8.gz
 
 %changelog
+* Wed Jul 03 2024 Phil Sutter <psutter@redhat.com> [1.8.10-4.el9]
+- spec: Simplify legacy package integration (Phil Sutter) [RHEL-5797]
+
 * Wed Jun 12 2024 Phil Sutter <psutter@redhat.com> [1.8.10-3.el9]
 - extensions: libxt_sctp: Add an extra assert() (Phil Sutter) [RHEL-40928]
 - spec: Add symlinks for merged extension DSOs (Phil Sutter) [RHEL-32463]