From 797db382fd7aef6c1d846e224c9081ac11f6a5c5e7cb874df183be5f58d13229 Mon Sep 17 00:00:00 2001 From: Clemens Famulla-Conrad Date: Tue, 21 Jun 2022 08:00:55 +0000 Subject: [PATCH] Accepting request 984102 from home:schubi2 - Moved logrotate files from user specif directory /etc/logrotate.d to vendor specif directory /usr/etc/logrotate.d. OBS-URL: https://build.opensuse.org/request/show/984102 OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=133 --- wpa_supplicant.changes | 6 ++++++ wpa_supplicant.spec | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes index e5d9cfd..020cc9c 100644 --- a/wpa_supplicant.changes +++ b/wpa_supplicant.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 21 07:29:22 UTC 2022 - Stefan Schubert + +- Moved logrotate files from user specif directory /etc/logrotate.d + to vendor specif directory /usr/etc/logrotate.d. + ------------------------------------------------------------------- Wed Jun 8 14:18:27 UTC 2022 - Callum Farmer diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 100c61d..cbdfe26 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -90,8 +90,13 @@ install -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name} install -d %{buildroot}/%{_datadir}/dbus-1/system-services install -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/dbus-1/system-services install -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/dbus-1/system-services +%if 0%{?suse_version} > 1500 +install -d %{buildroot}/%{_distconfdir}/logrotate.d/ +install -m 644 %{SOURCE4} %{buildroot}/%{_distconfdir}/logrotate.d/wpa_supplicant +%else install -d %{buildroot}/%{_sysconfdir}/logrotate.d/ install -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/logrotate.d/wpa_supplicant +%endif install -d %{buildroot}/%{_rundir}/%{name} install -d %{buildroot}%{_mandir}/man{5,8} install -m 0644 wpa_supplicant/doc/docbook/*.8 %{buildroot}%{_mandir}/man8 @@ -132,7 +137,11 @@ ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1. %{_datadir}/dbus-1/system.d/%{name}.conf %{_datadir}/dbus-1/system-services %config %{_sysconfdir}/%{name}/%{name}.conf +%if 0%{?suse_version} > 1500 +%config %{_distconfdir}/logrotate.d/wpa_supplicant +%else %config(noreplace) %{_sysconfdir}/logrotate.d/wpa_supplicant +%endif %dir %{_rundir}/%{name} %ghost %{_rundir}/%{name} %{_unitdir}/wpa_supplicant.service