From a0ad97358e62ad1e6b40e88b9b20eb58a85b1196965d4fc74dbe4d8d7fefb548 Mon Sep 17 00:00:00 2001 From: Clemens Famulla-Conrad Date: Thu, 9 Jun 2022 07:48:21 +0000 Subject: [PATCH] Accepting request 981333 from home:gmbr3:Active - Move the dbus-1 system.d file to /usr (bsc#1200342) OBS-URL: https://build.opensuse.org/request/show/981333 OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=132 --- wpa_supplicant.changes | 5 +++++ wpa_supplicant.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes index d799a5a..e5d9cfd 100644 --- a/wpa_supplicant.changes +++ b/wpa_supplicant.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 8 14:18:27 UTC 2022 - Callum Farmer + +- Move the dbus-1 system.d file to /usr (bsc#1200342) + ------------------------------------------------------------------- Sat Feb 5 09:28:52 UTC 2022 - Hans-Peter Jansen diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 96d304d..100c61d 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -83,8 +83,8 @@ install -m 0755 wpa_supplicant/wpa_cli %{buildroot}%{_sbindir} install -m 0755 wpa_supplicant/wpa_passphrase %{buildroot}%{_sbindir} install -m 0755 wpa_supplicant/wpa_supplicant %{buildroot}%{_sbindir} install -m 0755 wpa_supplicant/eapol_test %{buildroot}%{_sbindir} -install -d %{buildroot}%{_sysconfdir}/dbus-1/system.d -install -m 0644 wpa_supplicant/dbus/dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf +install -d %{buildroot}%{_datadir}/dbus-1/system.d +install -m 0644 wpa_supplicant/dbus/dbus-wpa_supplicant.conf %{buildroot}%{_datadir}/dbus-1/system.d/wpa_supplicant.conf install -d %{buildroot}/%{_sysconfdir}/%{name} install -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name} install -d %{buildroot}/%{_datadir}/dbus-1/system-services @@ -129,7 +129,7 @@ ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1. %{_sbindir}/wpa_cli %{_sbindir}/wpa_passphrase %{_sbindir}/wpa_supplicant -%config %{_sysconfdir}/dbus-1/system.d/%{name}.conf +%{_datadir}/dbus-1/system.d/%{name}.conf %{_datadir}/dbus-1/system-services %config %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/logrotate.d/wpa_supplicant