From 48c9ebfc911d9261f22df254831eba3f7443af9c Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Jul 25 2019 01:28:36 +0000 Subject: Work around RPM 4.15 change that broke the build --- diff --git a/apcupsd.spec b/apcupsd.spec index fb1c609..e750c28 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,10 @@ +# A change in RPM 4.15 causes the make_build macro to misbuild this package. +# See https://github.com/rpm-software-management/rpm/issues/798 +%global make_build %{__make} %{?_make_output_sync} %{?_smp_mflags} + Name: apcupsd Version: 3.14.14 -Release: 15%{?dist} +Release: 16%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -17,7 +21,7 @@ Patch0: apcupsd-3.14.9-fixgui.patch # Halt without powering off, rhbz#1442577 Patch1: apcupsd-3.14.4-shutdown.patch -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel BuildRequires: net-snmp-devel, libusb-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils @@ -160,6 +164,9 @@ rm examples/*.in %changelog +* Wed Jul 24 2019 Jason L Tibbitts III - 3.14.14-16 +- Workaround change in RPM 4.15 which breaks the build. + * Wed Jul 24 2019 Fedora Release Engineering - 3.14.14-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild