[0ad/f19] Merge with arm fixes and mass rebuild changes

[pcpa]

commit 5dea087533cd2b7833fd3f2657afe3377d897af4
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date:   Wed Jun 18 15:12:52 2014 -0300

    Merge with arm fixes and mass rebuild changes

 0ad.spec |   29 ++++++++++++-----------------
 1 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/0ad.spec b/0ad.spec
index 1c39888..7a8c7ce 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -17,15 +17,9 @@
 %global		with_system_nvtt	1
 %global		without_nvtt		0
 
-%if 0%{?fedora} <= 16
-%global		with_system_enet	0
-%else
-%global		with_system_enet	1
-%endif
-
 Name:		0ad
 Version:	0.0.16
-Release:	3%{?dist}
+Release:	6%{?dist}
 # BSD License:
 #	build/premake/*
 #	libraries/valgrind/*		(not built/used)
@@ -75,9 +69,7 @@ BuildRequires:	boost-devel
 BuildRequires:	cmake
 BuildRequires:	desktop-file-utils
 BuildRequires:	DevIL-devel
-%if %{with_system_enet}
 BuildRequires:	enet-devel
-%endif
 BuildRequires:	gamin-devel
 BuildRequires:	gloox-devel
 BuildRequires:	libcurl-devel
@@ -102,7 +94,7 @@ BuildRequires:	SDL-devel
 BuildRequires:	subversion
 BuildRequires:	wxGTK-devel
 
-ExclusiveArch:	%{ix86} x86_64
+ExclusiveArch:	%{ix86} x86_64 %{arm}
 
 # http://trac.wildfiregames.com/ticket/1421
 Patch0:		%{name}-rpath.patch
@@ -153,9 +145,7 @@ build/workspaces/update-workspaces.sh	\
     --bindir %{_bindir}			\
     --datadir %{_datadir}/%{name}	\
     --libdir %{_libdir}/%{name}		\
-%if %{with_system_enet}
     --with-system-enet			\
-%endif
     --with-system-mozjs24		\
     --with-system-miniupnpc		\
 %if %{with_system_nvtt}
@@ -185,10 +175,6 @@ for name in AtlasUI%{dbg} Collada%{dbg}; do
     install -p -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so
 done
 
-%if !%{with_system_enet}
-    install -p -m 755 binaries/system/libenet.so.1 %{buildroot}%{_libdir}/%{name}/libenet.so.1
-%endif
-
 %if !%{without_nvtt} && !%{with_system_nvtt}
 for name in nvcore nvimage nvmath nvtt; do
     install -p -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so
@@ -239,9 +225,18 @@ export STRIP=/bin/true
 %{_mandir}/man6/*.6*
 
 %changelog
-* Wed Jun 18 2014 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 0.0.16-3
+* Wed Jun 18 2014 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 0.0.16-6
 - Add proper patch for gcc 4.9 build
 
+* Fri Jun  6 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.0.16-5
+- Remove old Fedora release conditionals
+
+* Fri Jun 06 2014 Dennis Gilmore <dennis at ausil.us> - 0.0.16-4
+- add %%{arm} tp the ExclusiveArch list
+
+* Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Fri May 23 2014 Petr Machata <pmachata at redhat.com> - 0.0.16-2
 - Rebuild for boost 1.55.0