From b31285ff7dc4e2c302fcc97d974ebab91a04ac60bc01c884d06760d4309cb95d Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Fri, 4 Mar 2022 13:25:06 +0000
Subject: [PATCH] Accepting request 959442 from home:kukuk:container

- Fix modprobe.d directory for SLE15 SP3
- Cleanup dependencies:
  - ipset, ebtables and iptables are purely optional and deprecated,
    so don't require them
  - sysconfig is not needed at all
  - Don't hard require systemd, we don't have and need that in containers

OBS-URL: https://build.opensuse.org/request/show/959442
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/firewalld?expand=0&rev=120
---
 firewalld.changes | 10 ++++++++++
 firewalld.spec    | 17 +++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/firewalld.changes b/firewalld.changes
index 0aed7ee..048805d 100644
--- a/firewalld.changes
+++ b/firewalld.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Mar  3 14:26:57 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
+
+- Fix modprobe.d directory for SLE15 SP3
+- Cleanup dependencies:
+  - ipset, ebtables and iptables are purely optional and deprecated, 
+    so don't require them
+  - sysconfig is not needed at all
+  - Don't hard require systemd, we don't have and need that in containers
+
 -------------------------------------------------------------------
 Sat Feb 26 14:35:35 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/firewalld.spec b/firewalld.spec
index 25188fd..c08652c 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -20,8 +20,8 @@
 %if ! %{defined _fillupdir}
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
-%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300
-# systemd-rpm-macros(or kmod) is wrong in 15.2
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150400
+# systemd-rpm-macros(or kmod) is wrong in 15.2 and 15.3
 %define _modprobedir /lib/modprobe.d
 %endif
 Name:           firewalld
@@ -39,7 +39,7 @@ BuildRequires:  automake
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-xsl-stylesheets
 # Adding tools to BuildRequires as well so they can be autodetected
-# even though it is probably unlikely for paths to change in the future
+# Else the configure tool will set them to /bin/false
 BuildRequires:  ebtables
 BuildRequires:  fdupes
 BuildRequires:  gettext
@@ -50,22 +50,19 @@ BuildRequires:  intltool
 BuildRequires:  ipset
 BuildRequires:  iptables
 BuildRequires:  libxslt-tools
-BuildRequires:  nftables
 BuildRequires:  python3-devel
 BuildRequires:  systemd-rpm-macros
-Requires:       ebtables
-Requires:       ipset
-Requires:       iptables
-Requires:       logrotate
+Recommends:     logrotate
+# Workaround: nftables seems to be a python3-nftables requirement,
+# not of firewalld.
 Requires:       nftables
 Requires:       python3-firewall = %{version}
 Requires:       python3-gobject
 Requires:       python3-nftables
-Requires:       sysconfig
 Requires(post): %fillup_prereq
 Suggests:       susefirewall2-to-firewalld
 BuildArch:      noarch
-%{?systemd_requires}
+%{?systemd_ordering}
 
 %description
 firewalld is a firewall service daemon that provides a dynamic customizable