From f6becc5e5017e8bf97e682617ddd580f8c109171 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Apr 17 2014 06:53:45 +0000 Subject: fix multilib issue (#831429) --- diff --git a/nut.spec b/nut.spec index aac92f6..04783b5 100644 --- a/nut.spec +++ b/nut.spec @@ -13,7 +13,7 @@ Summary: Network UPS Tools Name: nut Version: 2.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/System License: GPLv2+ and GPLv3+ Url: http://www.networkupstools.org/ @@ -145,6 +145,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 \ @@ -434,6 +437,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Thu Apr 17 2014 Michal Hlavinka - 2.7.1-4 +- fix multilib issue (#831429) + * Thu Mar 06 2014 Michal Hlavinka - 2.7.1-3 - fix path of nut-driver executable (#1072076) - fix location of udev rules