diff --git a/cfengine.changes b/cfengine.changes index c632f35..b6e7f84 100644 --- a/cfengine.changes +++ b/cfengine.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 23 11:23:47 UTC 2019 - matthias.gerstner@suse.com + +- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by + firewalld, see [1]. + + [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html + ------------------------------------------------------------------- Fri Mar 8 12:51:04 UTC 2019 - Adam Majer diff --git a/cfengine.spec b/cfengine.spec index 54ad4ad..1082533 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -27,6 +27,11 @@ %else %define have_systemd 0 %endif +%if 0%{?suse_version} <= 150100 +%define with_sfw2 1 +%else +%define with_sfw2 0 +%endif # pass --with-bla to enable the build %bcond_with mysql %bcond_with postgresql @@ -289,7 +294,9 @@ do done # Firewall +%if %{with_sfw2} install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/cfengine +%endif # Ckeabyo dyoes %if 0%{?suse_version} > 1020 @@ -366,7 +373,9 @@ fi %{_sbindir}/rccf-execd %{_sbindir}/rccf-monitord %{_sbindir}/rccf-serverd +%if %{with_sfw2} %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/cfengine +%endif %{_mandir}/man8/* %dir %{basedir} %dir %{workdir}