From 1ee914cfb5a17b1454a9df3f6c3aeb7dd70b960b962d52e3394694b4b0b6b3c3 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Thu, 14 May 2020 21:20:33 +0000 Subject: [PATCH] Accepting request 800680 from home:pgajdos:libexec - use /usr/lib instead of %{_libexecdir} for systemd and udev rules, %{_libexecdir} is dedicated for internal binaries OBS-URL: https://build.opensuse.org/request/show/800680 OBS-URL: https://build.opensuse.org/package/show/hardware/nut?expand=0&rev=91 --- nut.changes | 6 ++++++ nut.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nut.changes b/nut.changes index dfe8990..d8fd5fe 100644 --- a/nut.changes +++ b/nut.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 6 10:45:51 UTC 2020 - pgajdos@suse.com + +- use /usr/lib instead of %{_libexecdir} for systemd and udev + rules, %{_libexecdir} is dedicated for internal binaries + ------------------------------------------------------------------- Tue Feb 25 20:40:40 CET 2020 - sbrabec@suse.com diff --git a/nut.spec b/nut.spec index eef976f..c3799aa 100644 --- a/nut.spec +++ b/nut.spec @@ -203,7 +203,7 @@ autoreconf -fvi --with-drvpath=%{MODELPATH} \ --with-user=%{NUT_USER} \ --with-group=%{NUT_GROUP} \ - --with-udev-dir=%{_libexecdir}/udev \ + --with-udev-dir=%{_udevrulesdir}/.. \ --enable-option-checking=fatal # does not create reproducible output with parallelism @@ -224,8 +224,8 @@ install -m 644 scripts/logrotate/nutlogd %{buildroot}%{_sysconfdir}/logrotate.d/ mkdir -p %{buildroot}%{STATEPATH} rename .sample "" %{buildroot}%{_sysconfdir}/ups/*.sample -install -d %{buildroot}%{_libexecdir}/systemd/system-sleep -install nut.system-sleep %{buildroot}%{_libexecdir}/systemd/system-sleep/%{name}.sh +install -d %{buildroot}/usr/lib/systemd/system-sleep +install nut.system-sleep %{buildroot}/usr/lib/systemd/system-sleep/%{name}.sh # Rename web pages to not conflict with apache2-example-pages or user home page: mkdir %{buildroot}%{HTMLPATH}/nut %{buildroot}%{CGIPATH}/nut @@ -307,7 +307,7 @@ udevadm trigger --subsystem-match=usb --property-match=DEVTYPE=usb_device %attr(700,%{NUT_USER},%{NUT_GROUP}) %{STATEPATH} %{_unitdir}/*.service %{systemdsystemdutildir}/system-shutdown/* -%{_libexecdir}/systemd/system-sleep/%{name}.sh +/usr/lib/systemd/system-sleep/%{name}.sh %{bashcompletionsdir}/* %files drivers-net