From ae3ecb7e191ccbcad9bd552a7bb56495fc8a56b39383e0a5180cf96b0ca9cf98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.com>
Date: Wed, 23 Sep 2020 08:17:38 +0000
Subject: [PATCH] firewalld has cfengine already built-in

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=189
---
 cfengine.firewalld | 6 ------
 cfengine.spec      | 8 --------
 2 files changed, 14 deletions(-)
 delete mode 100644 cfengine.firewalld

diff --git a/cfengine.firewalld b/cfengine.firewalld
deleted file mode 100644
index bef314c..0000000
--- a/cfengine.firewalld
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <short>CFengine</short>
-  <description>CFEngine automates large-scale IT computing infrastructure</description>
-  <port protocol="tcp" port="5308"/>
-</service>
diff --git a/cfengine.spec b/cfengine.spec
index b981334..46b1beb 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -55,7 +55,6 @@ Source6:        cf-execd
 Source7:        cf-serverd
 Source10:       %{name}.cron
 Source11:       %{name}-rpmlintrc
-Source12:       %{name}.firewalld
 # docs
 Source101:      http://www.cfengine.org/manuals/cf3-Reference.pdf
 Source102:      http://www.cfengine.org/manuals/cf3-conceptguide.pdf
@@ -241,9 +240,6 @@ done
 # Firewall
 %if %{with_sfw2}
 install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/cfengine
-%else
-mkdir -p %{buildroot}/%{_prefix}/lib/firewalld/services
-install -D -m 644 %{SOURCE12} %{buildroot}/%{_prefix}/lib/firewalld/services/%{name}.xml
 %endif
 
 # Ckeabyo dyoes
@@ -306,10 +302,6 @@ fi
 %config %dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d
 %config %dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/cfengine
-%else
-%dir %{_prefix}/lib/firewalld
-%dir %{_prefix}/lib/firewalld/services
-%{_prefix}/lib/firewalld/services/%{name}.xml
 %endif
 %{_mandir}/man8/*
 %dir %{basedir}