Hello community,
here is the log from the commit of package apcupsd for openSUSE:Factory checked
in at 2020-08-20 22:29:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
and /work/SRC/openSUSE:Factory/.apcupsd.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apcupsd"
Thu Aug 20 22:29:58 2020 rev:69 rq:828032 version:3.14.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes 2019-08-20
10:59:50.532650630 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new.3399/apcupsd.changes
2020-08-20 22:30:06.140017061 +0200
@@ -1,0 +2,15 @@
+Thu Aug 20 07:32:55 UTC 2020 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Fix build when /etc/os-release contains a LIST as ID_LIKE (which
+ is valid). Simply pass --with-distname=suse to configure when
+ %suse_version is defined. This is 'a nice way' of not explicitly
+ breaking build for non-suse releases (even though we're not
+ verifying it would really build on other distros based on this
+ spec).
+
+-------------------------------------------------------------------
+Wed Aug 19 09:41:05 UTC 2020 - Callum Farmer <callumjfarme...@gmail.com>
+
+- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apcupsd.spec ++++++
--- /var/tmp/diff_new_pack.Qftpxx/_old 2020-08-20 22:30:07.412017655 +0200
+++ /var/tmp/diff_new_pack.Qftpxx/_new 2020-08-20 22:30:07.420017659 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apcupsd
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -45,7 +45,6 @@
Patch13: apcupsd-3.14.9-fixgui.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel
-BuildRequires: distribution-release
BuildRequires: dos2unix
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -121,7 +120,10 @@
--enable-modbus-usb \
--enable-test \
--with-cgi-bin=%{apache_datadir}/cgi-bin \
- --with-distname=$(grep ID_LIKE %{_sysconfdir}/os-release | cut -d = -f
2 | tr -d '"')
+%if 0%{?suse_version}
+ --with-distname=suse \
+%endif
+ %nil
make %{?_smp_mflags}
%install
@@ -142,16 +144,16 @@
%fdupes -s examples/rpt/
rm -r %{buildroot}/%{_datadir}/hal
-mkdir -p %{buildroot}%{_libexecdir}/systemd/system-sleep
-sed "s:@PWRFAILDIR@:%{_sysconfdir}/%{name}:g" <%{name}.hibernate
>%{buildroot}%{_libexecdir}/systemd/system-sleep/apcupsd.sh
-chmod +x %{buildroot}%{_libexecdir}/systemd/system-sleep/apcupsd.sh
+mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep
+sed "s:@PWRFAILDIR@:%{_sysconfdir}/%{name}:g" <%{name}.hibernate
>%{buildroot}%{_prefix}/lib/systemd/system-sleep/apcupsd.sh
+chmod +x %{buildroot}%{_prefix}/lib/systemd/system-sleep/apcupsd.sh
mkdir -p %{buildroot}%{_fillupdir}
cp %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.%{name}
# systemd support and remove initd support for opensuse 12.2 and higher
install -p -D -m644 %{name}.service %{buildroot}%{_unitdir}/%{name}.service
-install -p -D -m755 %{name}_shutdown
%{buildroot}%{_libexecdir}/systemd/system-shutdown/%{name}_shutdown
+install -p -D -m755 %{name}_shutdown
%{buildroot}%{_prefix}/lib/systemd/system-shutdown/%{name}_shutdown
rm %{buildroot}%{_initddir}/%{name}
install -d %{buildroot}%{_sysconfdir}/logrotate.d
@@ -198,8 +200,8 @@
%{_sbindir}/smtp
%{_sbindir}/rc%{name}
%{_unitdir}/%{name}.service
-%{_libexecdir}/systemd/system-shutdown/%{name}_shutdown
-%{_libexecdir}/systemd/system-sleep/%{name}.sh
+%{_prefix}/lib/systemd/system-shutdown/%{name}_shutdown
+%{_prefix}/lib/systemd/system-sleep/%{name}.sh
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/changeme
%config(noreplace) %{_sysconfdir}/%{name}/commfailure
