From d3f927f0c8b14d05f14c68914e98ef2ff5e8e5a3a7f06b193c62d2409f826ee8 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Tue, 21 Jun 2022 18:20:51 +0000
Subject: [PATCH] Accepting request 984147 from home:schubi2

- Moved logrotate files from user specific directory /etc/logrotate.d
  to vendor specific directory /usr/etc/logrotate.d.

OBS-URL: https://build.opensuse.org/request/show/984147
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/firewalld?expand=0&rev=124
---
 firewalld.changes | 6 ++++++
 firewalld.spec    | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/firewalld.changes b/firewalld.changes
index 1fd4b4d..94258a8 100644
--- a/firewalld.changes
+++ b/firewalld.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 15 09:32:57 UTC 2022 - Stefan Schubert <schubi@suse.com>
+
+- Moved logrotate files from user specific directory /etc/logrotate.d
+  to vendor specific directory /usr/etc/logrotate.d.
+
 -------------------------------------------------------------------
 Wed Mar 30 17:09:49 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/firewalld.spec b/firewalld.spec
index 931d1dc..a109877 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -192,7 +192,9 @@ mkdir -p %{buildroot}%{_modprobedir}
 mv %{buildroot}%{_sysconfdir}/modprobe.d/* %{buildroot}%{_modprobedir}
 %if 0%{?suse_version} >= 1550
 mkdir -p %{buildroot}%{_distconfdir}/xdg/autostart
+mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
 mv %{buildroot}%{_sysconfdir}/xdg/autostart/* %{buildroot}%{_distconfdir}/xdg/autostart
+mv %{buildroot}%{_sysconfdir}/logrotate.d/firewalld %{buildroot}%{_distconfdir}/logrotate.d/firewalld
 %endif
 
 %fdupes %{buildroot}%{python3_sitelib}
@@ -283,7 +285,11 @@ fi
 %{_modprobedir}/firewalld-sysctls.conf
 %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
 %config(noreplace) %{_sysconfdir}/firewalld/lockdown-whitelist.xml
+%if 0%{?suse_version} > 1550
+%{_distconfdir}/logrotate.d/firewalld
+%else
 %config(noreplace) %{_sysconfdir}/logrotate.d/firewalld
+%endif
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/icmptypes
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services