From ab68e73c8967eb36bc44f6d7aee49dfbc46e0c68 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Thu, 8 May 2025 12:50:36 +0800
Subject: [PATCH] fix build with gettext 0.24.1

---
 firewalld-1.2.6-FTBTS-gettext-0.24.1.patch | 11 +++++++++++
 firewalld.spec                             | 20 +++++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 firewalld-1.2.6-FTBTS-gettext-0.24.1.patch

diff --git a/firewalld-1.2.6-FTBTS-gettext-0.24.1.patch b/firewalld-1.2.6-FTBTS-gettext-0.24.1.patch
new file mode 100644
index 0000000..eeff404
--- /dev/null
+++ b/firewalld-1.2.6-FTBTS-gettext-0.24.1.patch
@@ -0,0 +1,11 @@
+diff --git a/autogen.sh b/autogen.sh
+index 175dea5..ee2016b 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -14,5 +14,5 @@ ls po/*.po | sed -e 's/.po//' | sed -e 's/po\///' > po/LINGUAS
+ 
+ intltoolize --force --automake
+ 
+-autoreconf --force -v --install --symlink || exit 1
++autoreconf --force -v --install --symlink -I/usr/share/gettext/m4 || exit 1
+ cd $ORIGDIR || exit $?
diff --git a/firewalld.spec b/firewalld.spec
index 50eb532..fd6b2b0 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -1,9 +1,9 @@
 Name:      firewalld
 Version:   1.2.6
-Release:   7
+Release:   8
 Summary:   A firewall daemon with D-Bus interface providing a dynamic firewall
-License:   GPLv2+
-URL:       http://www.firewalld.org
+License:   GPL-2.0-or-later
+URL:       https://www.firewalld.org
 Source0:   https://github.com/firewalld/firewalld/releases/download/v%{version}/%{name}-%{version}.tar.gz
 
 Patch0:    firewalld-0.2.6-MDNS-default.patch
@@ -14,10 +14,12 @@ Patch4:    backport-chore-nftables-add-delete-table-helper.patch
 Patch5:    backport-fix-nftables-always-flush-main-table-on-start.patch
 Patch6:    backport-fix-service-update-highest-port-number-for-ceph.patch
 Patch7:    backport-fix-nm-release-NM-client-after-a-timeout.patch
+Patch8:    firewalld-1.2.6-FTBTS-gettext-0.24.1.patch
 
 BuildArch:     noarch
 BuildRequires: autoconf automake desktop-file-utils gettext intltool glib2 glib2-devel systemd-units docbook-style-xsl
 BuildRequires: libxslt iptables ebtables ipset python3-devel
+%{?systemd_requires}
 
 
 Requires:  iptables iptables-nft ipset systemd
@@ -111,18 +113,12 @@ mv %{buildroot}%{_sysconfdir}/firewalld/firewalld.conf \
 
 dd if=/dev/zero of=$RPM_BUILD_ROOT/%{_datadir}/firewalld/firewalld-tmp-mmap bs=4096 count=1
 
-%check
-
-%pre
-
 %preun
 %systemd_preun firewalld.service
 
-
 %post
 %systemd_post firewalld.service
 
-
 %postun
 %systemd_postun_with_restart firewalld.service
 if [ $1 -eq 0 ]; then
@@ -249,6 +245,12 @@ sed -i "s/CleanupModulesOnExit=no/CleanupModulesOnExit=yes/g" %{_sysconfdir}/fir
 %{_datadir}/firewalld/testsuite/python/firewalld_test.py
 
 %changelog
+* Thu May 08 2025 Funda Wang <fundawang@yeah.net> - 1.2.6-8
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC: fix build with gettext 0.24.1
+
 * Wed Aug 28 2024 zhouyihang <zhouyihang3@h-partners.com> - 1.2.6-7
 - Type:bugfix
 - CVE:NA
-- 
Gitee