diff --git a/apcupsd.service b/apcupsd.service index 2e199ff..614fec2 100644 --- a/apcupsd.service +++ b/apcupsd.service @@ -5,7 +5,7 @@ After=network-online.target [Service] ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail -ExecStart=/usr/bin/apcupsd -b -f /etc/apcupsd/apcupsd.conf +ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf KillMode=process [Install] diff --git a/apcupsd.spec b/apcupsd.spec index dde0ac9..ae63fd3 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 40%{?dist} +Release: 35%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -31,7 +31,7 @@ Patch4: 99-apcupsd-xfer-glitch.patch BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel -%if %{defined fedora} || (%{defined rhel} && 0%{?rhel} > 9) +%if %{defined fedora} BuildRequires: libusb-compat-0.1-devel %endif %if (%{defined rhel} && 0%{?rhel} <= 9) @@ -87,7 +87,7 @@ printf 'install:\n\techo skipped\n' > platforms/redhat/Makefile %configure \ --sysconfdir="/etc/apcupsd" \ --with-cgi-bin="/var/www/apcupsd" \ - --sbindir=%{_bindir} \ + --sbindir=/sbin \ --enable-cgi \ --enable-pthreads \ --enable-net \ @@ -144,11 +144,7 @@ rm examples/*.in %config(noreplace) /etc/apcupsd/onbattery %config(noreplace) /etc/logrotate.d/apcupsd /usr/share/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi -%{_bindir}/apcaccess -%{_bindir}/apctest -%{_bindir}/apcupsd -%exclude %{_bindir}/smtp - +%attr(0755,root,root) /sbin/* %{_mandir}/*/* %files cgi @@ -181,22 +177,6 @@ rm examples/*.in %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 3.14.14-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 3.14.14-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu May 22 2025 Gwyn Ciesla - 3.14.14-38 -- Don't ship /usr/bin/smtp, not used, conflicts with opensmtpd. - -* Fri May 09 2025 Gwyn Ciesla - 3.14.14-37 -- Move binaries from sbin to bin, 2365293. - -* Wed Apr 23 2025 Davide Cavalca - 3.14.14-36 -- Fix libusb conditional to make it build on EPEL 10 - Fixes: RHBZ#2337139 - * Wed Apr 09 2025 Germano Massullo - 3.14.14-35 - Adds 99-apcupsd-xfer-glitch.patch