Merge branch 'rawhide' into epel8

2025-04-09 12:52:24 +02:00 · 2024-11-11 12:52:34 +01:00 · 2024-11-08 19:42:37 +01:00 · 2024-11-08 17:41:36 +01:00 · 2024-11-08 17:00:26 +01:00 · 2024-05-29 18:21:51 -05:00
2 changed files with 5 additions and 25 deletions
--- 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]
--- 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 <releng@fedoraproject.org> - 3.14.14-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.14-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu May 22 2025 Gwyn Ciesla <gwync@protonmail.com> - 3.14.14-38
- Don't ship /usr/bin/smtp, not used, conflicts with opensmtpd.
-
-* Fri May 09 2025 Gwyn Ciesla <gwync@protonmail.com> - 3.14.14-37
- Move binaries from sbin to bin, 2365293.
-
-* Wed Apr 23 2025 Davide Cavalca <dcavalca@fedoraproject.org> - 3.14.14-36
- Fix libusb conditional to make it build on EPEL 10
-  Fixes: RHBZ#2337139
-
 * Wed Apr 09 2025 Germano Massullo <germano.massullo@gmail.com> - 3.14.14-35
 - Adds 99-apcupsd-xfer-glitch.patch
Author	SHA1	Message	Date
Germano Massullo	67d7efbc5f	Merge branch 'rawhide' into epel8	2025-04-09 12:52:24 +02:00
Germano Massullo	1bf55aa44a	Merge branch 'rawhide' into epel8	2024-11-11 12:52:34 +01:00
Germano Massullo	fff6b2e5e2	Merge branch 'rawhide' into epel8	2024-11-08 19:42:37 +01:00
Germano Massullo	f94a2a2c08	Merge branch 'rawhide' into epel8	2024-11-08 17:41:36 +01:00
Germano Massullo	9c15b57655	Merge branch 'rawhide' into epel8	2024-11-08 17:00:26 +01:00
Carl George	4b7020d939	Rebuild EPEL 8 Next package in EPEL 8	2024-05-29 18:21:51 -05:00
Jason Tibbitts	785f07fa78	Clean up .gitignore.	2024-05-29 18:10:21 -05:00
Jason Tibbitts	59175c6496	Fix format-security error. Add a patch to fix the one line of code which triggered a format-security error instead of disabling format security checks for the entire package.	2024-05-29 18:10:00 -05:00
Jason Tibbitts	764c735776	Use _make_verbose instead of hacks This is the single package which won't build with make V=1. Now that RPM has %_make_verbose to override this, use it instead of redefinining %make_build.	2024-05-29 18:09:53 -05:00
Jason Tibbitts	49e074b505	Fix build on F33+ Previous to F33, the files /usr/lib/rpm/config.{guess,sub} existed, and this package copied them into the autoconf directory. This was added in 2008 with no explanatory comment other than "new upstream version". RPM no longer includes those files, though copies do still exist in /usr/lib/rpm/redhat. The package appears fine without them.	2024-05-29 18:09:43 -05:00
Tom Stellard	6b3c0ced39	Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot	2024-05-29 18:07:35 -05:00
Troy Dawson	57cb7e82de	remove package.cfg per new epel-playground policy	2020-09-24 16:09:50 +00:00
Germano Massullo	6b5a479a6d	Merge branch 'master' into epel8	2020-06-11 16:26:06 +02:00
Gwyn Ciesla	7119e1d04d	"Adding package.cfg file"	2020-06-11 09:22:15 -05:00