[tachyon] Fix build on aarch64, Adjust ppc64 macro, Cleanup spec

[Peter Robinson]

commit d844023fdc2834618d128ece18a4edfc4135ef46
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Jun 16 21:41:20 2014 +0100

    Fix build on aarch64, Adjust ppc64 macro, Cleanup spec

 tachyon.spec |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/tachyon.spec b/tachyon.spec
index a869e9e..55fc3ea 100644
--- a/tachyon.spec
+++ b/tachyon.spec
@@ -1,4 +1,4 @@
-%ifarch alpha ppc64 sparc64 x86_64
+%ifarch alpha %{power64} sparc64 x86_64 aarch64
 %define target linux-64
 %else
 %define target linux
@@ -10,7 +10,7 @@
 Summary: Parallel / Multiprocessor Ray Tracing System
 Name: tachyon
 Version: 0.99
-Release: 0.10.%{beta}%{?dist}
+Release: 0.11.%{beta}%{?dist}
 URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
 Group: Applications/Engineering
 Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{version}%{beta}.tar.gz
@@ -77,7 +77,7 @@ with tachyon.
 %setup -q -n %{name}
 %patch0 -p1 -b .r
 %patch1 -p1 -b .shared
-find . -name CVS | xargs %{__rm} -r
+find . -name CVS | xargs rm -r
 # executable sources
 chmod 644 src/hash.{c,h}
 chmod 644 src/pngfile.h
@@ -85,65 +85,63 @@ chmod 644 demosrc/spaceball.c
 chmod 644 demosrc/trackball.{c,h}
 chmod 644 scenes/imaps/*
 # work around unsupported -m32 gcc option
-%ifarch armv7hl
+%ifarch armv7hl aarch64
 sed -i -e 's/-m32 //g' unix/Make-arch
+sed -i -e 's/-m64 //g' unix/Make-arch
 %endif
 
 %build
 pushd unix
 for variant in %{variants} ; do
-  %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant
+  make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant
 done
 popd
 
 pushd docs
-%{__make} html pdf ps
+make html pdf ps
 popd
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},{%{_datadir},%{_includedir}}/tachyon,%{_mandir}/man1}
 for variant in %{variants} ; do
   install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant
 done
 rename -- -thr "" $RPM_BUILD_ROOT%{_bindir}/*
 mkdir docs/html
-%{__cp} -pr docs/tachyon/*.{css,html,png} docs/html
-%{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/
+cp -pr docs/tachyon/*.{css,html,png} docs/html
+cp -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/
 install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
 echo ".so tachyon.1" > $RPM_BUILD_ROOT%{_mandir}/man1/tachyon-ogl.1
-%{__cp} -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/
+cp -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/
 install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
 %files libs
-%defattr(644,root,root,755)
 %doc Copyright README
 %{_libdir}/libtachyon-%{version}.so
 
 %files gl
-%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}-ogl
 %{_mandir}/man1/%{name}-ogl.1*
 
 %files devel
-%defattr(644,root,root,755)
 %{_includedir}/tachyon
 %{_libdir}/libtachyon.so
 
 %files docs
-%defattr(644,root,root,755)
 %doc Changes docs/tachyon.pdf docs/tachyon.ps docs/html
 %{_datadir}/tachyon
 
 %changelog
+* Fri Jun 13 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.99-0.11.b6
+- Fix build on aarch64
+- Adjust ppc64 macro
+- Cleanup spec
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99-0.10.b6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild