From e3c62428bf1078cb67b89f5ba88951eb20f6d58a Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Jun 06 2014 23:06:15 +0000
Subject: fix merge


---

diff --git a/0ad.spec b/0ad.spec
index 71be563..90de374 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -19,7 +19,7 @@
 
 Name:		0ad
 Version:	0.0.16
-Release:	3%{?dist}
+Release:	5%{?dist}
 # BSD License:
 #	build/premake/*
 #	libraries/valgrind/*		(not built/used)
@@ -225,10 +225,15 @@ export STRIP=/bin/true
 %{_mandir}/man6/*.6*
 
 %changelog
-* Fri Jun  6 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.0.16-3
-- ARM is now supported
+* Fri Jun  6 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.0.16-5
 - Remove old Fedora release conditionals
 
+* Fri Jun 06 2014 Dennis Gilmore <dennis@ausil.us> - 0.0.16-4
+- add %%{arm} tp the ExclusiveArch list
+
+* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 0.0.16-2
 - Rebuild for boost 1.55.0