[hedgewars] Use simpler method for handling compiler options

[Bruno Wolff III]

commit 8443a2388971834f7feb18b6f2413a8c7ba2ef92
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Jan 3 16:32:11 2015 -0600

    Use simpler method for handling compiler options
    
    The current hedgewars makes it a lot simpler to use distro compiler
    options for things and we are taking advantage of that.

 hedgewars-0.9.18-no-dyn-haskell.patch |   17 -------------
 hedgewars-compiler-opts.patch         |   43 ---------------------------------
 hedgewars.spec                        |   22 ++++++++++-------
 3 files changed, 13 insertions(+), 69 deletions(-)
---
diff --git a/hedgewars.spec b/hedgewars.spec
index 5de15d5..3c197dd 100644
--- a/hedgewars.spec
+++ b/hedgewars.spec
@@ -9,16 +9,14 @@ URL:            http://www.hedgewars.org/
 Source0:        http://download.gna.org/hedgewars/hedgewars-src-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Source2:        %{name}.appdata.xml
-Patch0:         hedgewars-compiler-opts.patch
 # Text.Show.ByteString currently isn't available in Fedora and for the
 # the time being we need to use a patch to have hedgewars-server not
 # use that function.
-# The patch below is a trimmed version of the patch Debian is using
+# The patch below is based on a version of the patch Debian is using
 # avoid the same issue. The original patch is available from:
 # https://launchpadlibrarian.net/85736468/hedgewars_0.9.17-1~maverick0.1.debdiff
 Patch1:         hedgewars-no-bytestring.patch
 # ghc does not support -dynamic on arm
-#Patch4:         hedgewars-0.9.18-no-dyn-haskell.patch
 BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
 BuildRequires:  SDL_ttf-devel openssl-devel cmake desktop-file-utils
 BuildRequires:  libpng-devel
@@ -58,21 +56,27 @@ A standalone server that can be used for LAN play or a private internet server.
 
 %prep
 %setup -q -n %{name}-src-%{version}
-#%patch0 -p1
 %patch1 -p0
-%ifarch %{arm}
-# ghc does not support -dynamic on arm
-#%patch4 -p1
-%endif
+
 # Make sure that we don't use bundled libraries
 rm -r misc/liblua misc/libphysfs
 
 %build
 
+# -DMINIMAL_FLAGS=1 uses distro complie flags as much as possible
+
 # -DNOVIDEOREC=1 disables video recording which for now needs 
 # things Fedora can't provide.
 
-%cmake -DWITH_SERVER=1 -DNOVIDEOREC=1 .
+# -DGHFLAGS=-dynamic uses dynamic linking for Haskell, but this isn't 
+# available on arm.
+
+%ifarch %{arm}
+%cmake -DMINIMAL_FLAGS=1 -DNOVIDEOREC=1 .
+%else
+%cmake -DMINIMAL_FLAGS=1 -DNOVIDEOREC=1 -DGHFLAGS=-dynamic .
+%endif
+
 make %{?_smp_mflags} VERBOSE=1