From 26e358b74474e430fabec617a1711187ef8a0eb9 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Apr 17 2014 07:47:25 +0000 Subject: fix multilib issue (#831429) --- diff --git a/nut.spec b/nut.spec index 83e25f4..4b87d2c 100644 --- a/nut.spec +++ b/nut.spec @@ -13,7 +13,7 @@ Summary: Network UPS Tools Name: nut Version: 2.6.5 -Release: 12%{?dist} +Release: 13%{?dist} Group: Applications/System License: GPLv2+ and GPLv3+ Url: http://www.networkupstools.org/ @@ -139,6 +139,9 @@ do sed -i 's/\r\n*$//' $f done +# workaround for multilib conflicts - caused by patch changing modification time of scripts +find . -mtime -1 -print0 | xargs -0 touch --reference %{SOURCE0} + %build autoreconf -i %configure \ @@ -430,6 +433,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Thu Apr 17 2014 Michal Hlavinka - 2.6.5-13 +- fix multilib issue (#831429) + * Mon Apr 22 2013 Michal Hlavinka - 2.6.5-12 - do not let upsmon run during update (#916472) - make binaries hardened (#955157)