From 8dfdc677e1cf0cd588b5c7491e6024dcc891ce59 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 17:47:59 +0100
Subject: [PATCH] update sbindir path [release 5.2.8-2mamba;Sun Aug 08 2021]

---
 shorewall-core.spec | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/shorewall-core.spec b/shorewall-core.spec
index 2044c08..70403ee 100644
--- a/shorewall-core.spec
+++ b/shorewall-core.spec
@@ -2,18 +2,17 @@
 %define maj3ver %(echo %version | cut -d. -f1-3)
 Name:          shorewall-core
 Version:       5.2.8
-Release:       1mamba
+Release:       2mamba
 Summary:       Shoreline Firewall, a high-level tool for configuring Netfilter
 Group:         Network/Security
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://www.shorewall.net/index.htm
+URL:           https://shorewall.org/index.htm
 Source:        http://www.shorewall.net/pub/shorewall/%{majver}/shorewall-%{maj3ver}/shorewall-core-%{version}.tar.bz2
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 ## AUTOBUILDREQ-END
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 The Shoreline Firewall, more commonly known as "Shorewall", is a high-level tool for configuring Netfilter. You describe your firewall/gateway requirements using entries in a set of configuration files. Shorewall reads those configuration files and with the help of the iptables utility, Shorewall configures Netfilter to match your requirements. Shorewall can be used on a dedicated firewall system, a multi-function gateway/router/server or on a standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains compatibility mode; as a consequence, Shorewall can take advantage of Netfilter's connection state tracking capabilities to create a stateful firewall.
@@ -25,6 +24,8 @@ The Shoreline Firewall, more commonly known as "Shorewall", is a high-level tool
 ./configure \
    VENDOR=linux \
    --prefix=%{_prefix} \
+   --bindir=%{_bindir} \
+   --sbindir=%{_sbindir} \
    --mandir=%{_mandir} \
    --sysconfdir=%{_sysconfdir} \
    --initdir=%{_initrddir}
@@ -33,6 +34,7 @@ The Shoreline Firewall, more commonly known as "Shorewall", is a high-level tool
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 DESTDIR=%{buildroot} ./install.sh shorewallrc.default
 mv %{buildroot}/usr/man/* %{buildroot}/%{_mandir}/
+mv %{buildroot}/sbin %{buildroot}/usr/
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -40,19 +42,15 @@ mv %{buildroot}/usr/man/* %{buildroot}/%{_mandir}/
 %files
 %defattr(-,root,root)
 %dir %{_datadir}/shorewall
-/sbin/shorewall
-%{_mandir}/shorewall.8.gz
-%{_datadir}/shorewall/lib.core
-%{_datadir}/shorewall/coreversion
-%{_datadir}/shorewall/functions
-%{_datadir}/shorewall/lib.base
-%{_datadir}/shorewall/lib.cli
-%{_datadir}/shorewall/lib.common
-%{_datadir}/shorewall/shorewallrc
-%{_datadir}/shorewall/wait4ifup
+%{_sbindir}/shorewall
+%{_datadir}/shorewall/*
+%{_mandir}/shorewall.8*
 %doc COPYING
 
 %changelog
+* Sun Aug 08 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.2.8-2mamba
+- update sbindir path
+
 * Fri Sep 25 2020 Automatic Build System <autodist@mambasoft.it> 5.2.8-1mamba
 - automatic version update by autodist