From 248c0adb593a9638d2ea93fb6acec7a935272034 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 10 Aug 2020 11:13:09 -0400 Subject: [PATCH] switch to _target_cpu to avoid mismatch with uname -m on i386 --- torque.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/torque.spec b/torque.spec index ff263df..2eb519f 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 4.2.10 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -517,7 +517,7 @@ rm %{buildroot}%{_mandir}/man1/basl2c.1 chmod 755 `find %{buildroot}/var/lib/torque -type d` # Use wrapper script for pbs-config and rename original script to include architecture name -mv %{buildroot}%{_bindir}/pbs-config %{buildroot}%{_bindir}/pbs-config-%{_arch} +mv %{buildroot}%{_bindir}/pbs-config %{buildroot}%{_bindir}/pbs-config-%{_target_cpu} install -m0755 -p %{SOURCE100} %{buildroot}%{_bindir}/pbs-config %post @@ -757,7 +757,7 @@ fi %{_includedir}/torque %exclude %{_includedir}/torque/drmaa.h %{_bindir}/pbs-config -%{_bindir}/pbs-config-%{_arch} +%{_bindir}/pbs-config-%{_target_cpu} %{_mandir}/man3/pbs_alterjob.3.* %{_mandir}/man3/pbs_connect.3.* %{_mandir}/man3/pbs_default.3.* @@ -886,6 +886,10 @@ fi %endif %changelog +* Mon Aug 10 2020 Tom Callaway - 4.2.10-28 +- using "%%{_arch}" resulted in a mismatch with uname -m on i386. + switched to "%%{_target_cpu}" + * Wed Jul 29 2020 Fedora Release Engineering - 4.2.10-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild