From 991b466c6e3506ed4282fe827ffaf3d4af7953fe Mon Sep 17 00:00:00 2001
From: Eric Garver <egarver@redhat.com>
Date: Wed, 7 Feb 2018 11:42:15 -0500
Subject: [PATCH] rebase to v0.5.1

---
 .gitignore     |  1 +
 firewalld.spec | 19 +++++++++----------
 sources        |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index c85806b..daf6141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@
 /firewalld-selinux-0.4.4.1.tar
 /firewalld-0.4.4.3.tar.bz2
 /firewalld-0.4.4.5.tar.gz
+/firewalld-0.5.1.tar.gz
diff --git a/firewalld.spec b/firewalld.spec
index 4e0952f..3459219 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -7,11 +7,11 @@
 
 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
 Name: firewalld
-Version: 0.4.4.5
-Release: 6%{?dist}
+Version: 0.5.1
+Release: 1%{?dist}
 URL:     http://www.firewalld.org
 License: GPLv2+
-Source0: https://github.com/t-woerner/firewalld/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0: https://github.com/firewalld/firewalld/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 %if 0%{?fedora}
 Source1: FedoraServer.xml
 Source2: FedoraWorkstation.xml
@@ -19,9 +19,9 @@ Source2: FedoraWorkstation.xml
 %if 0%{?fedora}
 Patch0: firewalld-0.2.6-MDNS-default.patch
 %endif
-Patch1: firewalld-0.4.4.5-rich_source_validation-d69b7cb.patch
-Patch2: firewalld-0.4.4.5-ipv6_icmptype_only_rich_rule_fix-cf50bd0.patch
 BuildArch: noarch
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -161,8 +161,6 @@ firewalld.
 %if 0%{?fedora}
 %patch0 -p1
 %endif
-%patch1 -p1 -b .rich_source_validation-d69b7cb
-%patch2 -p1 -b .ipv6_icmptype_only_rich_rule_fix-cf50bd0
 ./autogen.sh
 
 %if 0%{?with_python3}
@@ -320,9 +318,6 @@ fi
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/ipsets
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones
-%dir %{_datadir}/firewalld
-%dir %{_datadir}/firewalld/tests
-%{_datadir}/firewalld/tests
 %defattr(0644,root,root)
 %config(noreplace) %{_sysconfdir}/sysconfig/firewalld
 %{_unitdir}/firewalld.service
@@ -339,6 +334,7 @@ fi
 %{_mandir}/man1/firewallctl*.1*
 %{_mandir}/man1/firewalld*.1*
 %{_mandir}/man5/firewall*.5*
+%{_sysconfdir}/modprobe.d/firewalld-sysctls.conf
 
 %files -n python2-firewall
 %attr(0755,root,root) %dir %{python2_sitelib}/firewall
@@ -408,6 +404,9 @@ fi
 %{_mandir}/man1/firewall-config*.1*
 
 %changelog
+* Wed Feb 07 2018 Eric Garver <egarver@redhat.com> - 0.5.1-1
+- rebase package to v0.5.1
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.4.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 0a891e7..da74c53 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (firewalld-0.4.4.5.tar.gz) = 4e64a383ee62c4b176889158be272831e497e48ca6fbc425f35322ca8acfd1af0c1ff3b8d71759996c0eb6e51a884cd84e74bd6398a0980be3d6e7a4b7f5071d
+SHA512 (firewalld-0.5.1.tar.gz) = 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be