From 262a8cca8ab389d4b0d080afd82cb9a92218d89e Mon Sep 17 00:00:00 2001
From: Eric Garver <egarver@redhat.com>
Date: Fri, 12 Jul 2024 11:44:39 -0400
Subject: [PATCH] rebase to v2.2.0

---
 .gitignore     | 1 +
 firewalld.spec | 8 +++++---
 sources        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 62532d3..fc132e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,3 +79,4 @@
 /firewalld-2.1.0.tar.bz2
 /firewalld-2.1.1.tar.bz2
 /firewalld-2.1.2.tar.bz2
+/firewalld-2.2.0.tar.bz2
diff --git a/firewalld.spec b/firewalld.spec
index 69c37ce..b32a48e 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -1,7 +1,7 @@
 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
 Name: firewalld
-Version: 2.1.2
-Release: 3%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 URL:     http://www.firewalld.org
 License: GPL-2.0-or-later
 Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.bz2
@@ -148,7 +148,6 @@ install -d -m 755 %{buildroot}%{_prefix}/lib/firewalld/zones/
 %{_prefix}/lib/firewalld/xmlschema/*.xsd
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld
 %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
-%config(noreplace) %{_sysconfdir}/firewalld/lockdown-whitelist.xml
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/helpers
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/icmptypes
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/ipsets
@@ -234,6 +233,9 @@ install -d -m 755 %{buildroot}%{_prefix}/lib/firewalld/zones/
 %{_mandir}/man1/firewall-config*.1*
 
 %changelog
+* Fri Jul 12 2024 Eric Garver <egarver@redhat.com> - 2.2.0-1
+- rebase package to v2.2.0
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.1.2-3
 - Bump release for June 2024 mass rebuild
 
diff --git a/sources b/sources
index 1ea24a9..51f54af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (firewalld-2.1.2.tar.bz2) = c2f107a917093fbd51448b954c98ccdb90c4a19880dc69d13f3e9f179cb271b3a67015e315f05ba3b0d0ccd1dc5c01d3737a6c7f91430667f6ee3b468785cd4f
+SHA512 (firewalld-2.2.0.tar.bz2) = d53f4d89f64ce1f4e304a29d9b50de75bd79a7cdfc86acd97f2ce389f044e1010cd37b8577bd68af73731fcf10958e9b26a8372d255105f3d906dde9afda8717