rpms/torque
6
0
Fork 0
Code Issues Pull Requests Releases Activity

switch to _target_cpu to avoid mismatch with uname -m on i386

Browse Source
This commit is contained in:
Tom Callaway 2020-08-10 11:13:09 -04:00
parent d6e881e38e
commit 248c0adb59
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
torque.spec
View File

@ -71,7 +71,7 @@
Name: torque Name: torque
Version: 4.2.10 Version: 4.2.10
Release: 27%{?dist} Release: 28%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop Source2: xpbs.desktop
@ -517,7 +517,7 @@ rm %{buildroot}%{_mandir}/man1/basl2c.1
chmod 755 `find %{buildroot}/var/lib/torque -type d` chmod 755 `find %{buildroot}/var/lib/torque -type d`
# Use wrapper script for pbs-config and rename original script to include architecture name # 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 install -m0755 -p %{SOURCE100} %{buildroot}%{_bindir}/pbs-config
%post %post
@ -757,7 +757,7 @@ fi
%{_includedir}/torque %{_includedir}/torque
%exclude %{_includedir}/torque/drmaa.h %exclude %{_includedir}/torque/drmaa.h
%{_bindir}/pbs-config %{_bindir}/pbs-config
%{_bindir}/pbs-config-%{_arch} %{_bindir}/pbs-config-%{_target_cpu}
%{_mandir}/man3/pbs_alterjob.3.* %{_mandir}/man3/pbs_alterjob.3.*
%{_mandir}/man3/pbs_connect.3.* %{_mandir}/man3/pbs_connect.3.*
%{_mandir}/man3/pbs_default.3.* %{_mandir}/man3/pbs_default.3.*
@ -886,6 +886,10 @@ fi
%endif %endif
%changelog %changelog
* Mon Aug 10 2020 Tom Callaway <spot@fedoraproject.org> - 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 <releng@fedoraproject.org> - 4.2.10-27 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.10-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild