[prboom] - aarch64 support (#926369) - Adding BuildConflicts with libpng-devel

[Jaromír Cápík]

commit 831c3172a47fa6d4389a6f93fb7f904b3d591016
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Wed Apr 3 18:38:40 2013 +0200

    - aarch64 support (#926369)
    - Adding BuildConflicts with libpng-devel

 prboom.spec |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/prboom.spec b/prboom.spec
index ebd56fa..fe64eee 100644
--- a/prboom.spec
+++ b/prboom.spec
@@ -2,36 +2,42 @@
 
 Name:           prboom
 Version:        2.5.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://prboom.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/prboom/prboom-2.5.0.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
 BuildRequires:  libGLU-devel
+BuildRequires:  autoconf >= 2.69-10
+
 Requires:       freedoom
 
+# FIXME one day
+BuildConflicts: libpng-devel
+
 %description
 prboom is an open-source port of Doom, the classic 3D first-person shooter
 game.  It totally outclassed any 3D world games that preceded it, with amazing
 speed, flexibility, and outstanding gameplay. The specs to the game were
 released, and thousands of extra levels were written by fans of the game; even
 today new levels are written for Doom faster then any one person could play
-them. 
+them.
 
 %prep
 %setup -q
 
 %build
+autoreconf -vif
+
 %configure --enable-gl --disable-cpu-opt --program-prefix='' --with-waddir=%{waddir} --disable-i386-asm
+
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Move the binaries out of the crufty /usr/games directory
@@ -42,12 +48,7 @@ mv $RPM_BUILD_ROOT/usr/games/* $RPM_BUILD_ROOT/%{_bindir}
 # section below.
 rm -rf $RPM_BUILD_ROOT/%{_docdir}
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %{_bindir}/prboom
 %{_bindir}/prboom-game-server
 %dir %{waddir}
@@ -58,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Thu Mar 28 2013 Jaromir Capik <jcapik at redhat.com> - 2.5.0-9
+- aarch64 support (#926369)
+- Adding BuildConflicts with libpng-devel
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild