Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apcupsd for openSUSE:Factory checked in at 2022-03-26 22:31:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apcupsd (Old) and /work/SRC/openSUSE:Factory/.apcupsd.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apcupsd" Sat Mar 26 22:31:08 2022 rev:72 rq:965010 version:3.14.14 Changes: -------- --- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes 2022-03-16 20:21:55.725033371 +0100 +++ /work/SRC/openSUSE:Factory/.apcupsd.new.1900/apcupsd.changes 2022-03-26 22:31:21.205977250 +0100 @@ -1,0 +2,7 @@ +Tue Feb 22 11:09:56 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Conditionally disable build for gcapmon for Tumbleweed and newer + via bcond. Gconf-2 is being removed from Tumbleweed, as it is + deprecated and archived upstream. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apcupsd.spec ++++++ --- /var/tmp/diff_new_pack.iy6hTL/_old 2022-03-26 22:31:21.801978066 +0100 +++ /var/tmp/diff_new_pack.iy6hTL/_new 2022-03-26 22:31:21.809978077 +0100 @@ -16,6 +16,11 @@ # +%if 0%{?suse_version} >= 1550 +%{nil} +%else +%bcond_without gapcmon +%endif #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates @@ -54,13 +59,15 @@ BuildRequires: pkgconfig BuildRequires: systemd-rpm-macros BuildRequires: tcpd-devel +BuildRequires: pkgconfig(gdlib) +%if %{with gapcmon} BuildRequires: update-desktop-files BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(gdlib) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(x11) +%endif Requires: mailx Requires(post): %fillup_prereq Requires(post): grep @@ -85,6 +92,7 @@ %description cgi A CGI interface to the APC UPS monitoring daemon. +%if %{with gapcmon} %package gui Summary: APC UPS Monitor GUI (for APC UPSs) Group: Hardware/UPS @@ -98,6 +106,7 @@ APC also made their PowerChute plus available for download at http://www.apc.com/tools/download/. +%endif %prep %setup -q @@ -113,7 +122,11 @@ --with-libwrap \ --with-lock-dir=%{_localstatedir}/lock \ SHUTDOWN=/usr/sbin/shutdown \ +%if %{with gapcmon} --enable-gapcmon \ +%else + --disable-gapcmon \ +%endif --enable-cgi \ --enable-usb \ --enable-modbus-usb \ @@ -130,8 +143,10 @@ install -m744 platforms/apccontrol \ %{buildroot}%{_sysconfdir}/%{name}/apccontrol ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name} +%if %{with gapcmon} %suse_update_desktop_file gapcmon chmod 644 %{buildroot}/%{_datadir}/pixmaps/*.png +%endif # Cleanup for later doc macro processing chmod -x examples/*.c rm examples/*.in @@ -213,10 +228,12 @@ %{_mandir}/man?/*.* %{_fillupdir}/sysconfig.%{name} +%if %{with gapcmon} %files gui %{_bindir}/gapcmon %{_datadir}/applications/gapcmon.desktop %{_datadir}/pixmaps/*.png +%endif %files cgi %config(noreplace) %{_sysconfdir}/apache2/conf.d/%{name}.conf