From 37bc9b79aacc69b73306ac4f313289cf7a68e9fcc6d4972889fce6d7e8085f83 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 13 Jun 2022 08:25:42 +0000 Subject: [PATCH] Accepting request 981335 from home:gmbr3:Active - Move the dbus-1 system.d file to /usr (bsc#1200344) OBS-URL: https://build.opensuse.org/request/show/981335 OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=147 --- dnsmasq.changes | 5 +++++ dnsmasq.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dnsmasq.changes b/dnsmasq.changes index 54197f3..34f0a17 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 8 14:24:38 UTC 2022 - Callum Farmer + +- Move the dbus-1 system.d file to /usr (bsc#1200344) + ------------------------------------------------------------------- Tue Apr 5 07:16:18 UTC 2022 - Reinhard Max diff --git a/dnsmasq.spec b/dnsmasq.spec index 29a37c5..8851347 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -175,8 +175,8 @@ make install-i18n DESTDIR=%{buildroot} PREFIX=%{_prefix} AWK=gawk COPTS=%{_copts install -d -m 755 %{buildroot}/%{_sysconfdir}/slp.reg.d install -m 644 dnsmasq.conf.example %{buildroot}/%{_sysconfdir}/dnsmasq.conf install -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/slp.reg.d/ -install -d 755 %{buildroot}%{_sysconfdir}/dbus-1/system.d/ -install -m 644 dbus/dnsmasq.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/dnsmasq.conf +install -d 755 %{buildroot}%{_datadir}/dbus-1/system.d/ +install -m 644 dbus/dnsmasq.conf %{buildroot}%{_datadir}/dbus-1/system.d/dnsmasq.conf install -D -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/dnsmasq.service %if %{without tftp_user_package} install -d -m 0755 %{buildroot}/srv/tftpboot @@ -215,7 +215,7 @@ rm -rf contrib/MacOSX-launchd %dir %{_sysconfdir}/slp.reg.d/ %config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg %{_mandir}/man8/dnsmasq.8%{?ext_man} -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf +%{_datadir}/dbus-1/system.d/dnsmasq.conf %{_unitdir}/dnsmasq.service %dir %{_sysconfdir}/dnsmasq.d %config(noreplace) %{_sysconfdir}/dnsmasq.d/trust-anchors.conf