[freeciv] Fix for hardened/SDL_mixer issue.

[Jon Ciesla]

commit 140357accf686f459c30103cb96e5305c7a6cc9c
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Aug 29 08:58:47 2012 -0500

    Fix for hardened/SDL_mixer issue.

 freeciv-2.3.2-hardened-SDL_mixer.patch |   11 +++++++++++
 freeciv.spec                           |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/freeciv-2.3.2-hardened-SDL_mixer.patch b/freeciv-2.3.2-hardened-SDL_mixer.patch
new file mode 100644
index 0000000..d5c4719
--- /dev/null
+++ b/freeciv-2.3.2-hardened-SDL_mixer.patch
@@ -0,0 +1,11 @@
+--- freeciv-2.3.2/configure~	2012-03-31 07:37:54.000000000 -0500
++++ freeciv-2.3.2/configure	2012-08-29 08:51:28.595719680 -0500
+@@ -20294,7 +20294,7 @@
+     ac_save_CPPFLAGS="$CPPFLAGS"
+     ac_save_CFLAGS="$CFLAGS"
+     ac_save_LIBS="$LIBS"
+-    CPPFLAGS="$CFLAGS $SDL_CFLAGS"
++    CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+     CFLAGS="$CFLAGS $SDL_CFLAGS"
+     LIBS="$LIBS $SDL_LIBS"
+     ac_fn_c_check_header_mongrel "$LINENO" "SDL_mixer.h" "ac_cv_header_SDL_mixer_h" "$ac_includes_default"
diff --git a/freeciv.spec b/freeciv.spec
index ec98759..362a760 100644
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -6,13 +6,14 @@
 
 Name:           freeciv
 Version:        2.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A multi-player strategy game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/freeciv/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         freeciv-2.3.2-hardened-SDL_mixer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ##Fix DSO patch
@@ -43,6 +44,7 @@ in order to become the leader of the greatest civilization.
 %prep
 %setup -q -n %{name}-%{version}
 %patch10 -p0
+%patch0 -p1
 
 %build
 %configure --enable-client=gtk --disable-static
@@ -117,6 +119,9 @@ fi
 
 
 %changelog
+* Wed Aug 29 2012 Jon Ciesla <limburgher at gmail.com> - 2.3.2-3
+- Fix SDL_mixer/hardened build interaction, BZ 852635.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild