From a9d98f5883a37912fae4bb6bac7cc3ad4e16f533 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Feb 22 2016 16:40:48 +0000
Subject: Update to current git snapshot.


- Fix FTBFS.
- BuildRequires: texti2html
- Drop Group tag.

---

diff --git a/0004-src-lev-Proxy.cc-fix-check-for-basic_ifstream-s-read.patch b/0004-src-lev-Proxy.cc-fix-check-for-basic_ifstream-s-read.patch
new file mode 100644
index 0000000..a736c6c
--- /dev/null
+++ b/0004-src-lev-Proxy.cc-fix-check-for-basic_ifstream-s-read.patch
@@ -0,0 +1,26 @@
+From 016017c5afa803ffe79e5b667a9a0a8377ea098e Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt@redhat.com>
+Date: Mon, 22 Feb 2016 17:24:47 +0100
+Subject: [PATCH 4/4] src/lev/Proxy.cc: fix check for basic_ifstream's
+ readiness
+
+---
+ src/lev/Proxy.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lev/Proxy.cc b/src/lev/Proxy.cc
+index 6d58c0ba9a..69f54a20b8 100644
+--- a/src/lev/Proxy.cc
++++ b/src/lev/Proxy.cc
+@@ -933,7 +933,7 @@ namespace enigma { namespace lev {
+                     } else if (haveLocalCopy) {
+                         // plain file
+                         basic_ifstream<char> ifs(absExtPath.c_str(), ios::binary | ios::in);
+-                        if (ifs != NULL)
++                        if (ifs)
+                             Readfile(ifs, extCode);
+                         else
+                             haveLocalCopy = false;
+-- 
+2.5.0
+
diff --git a/enigma.spec b/enigma.spec
index 081fa09..d3bbfeb 100644
--- a/enigma.spec
+++ b/enigma.spec
@@ -1,19 +1,26 @@
 Name:           enigma
 Version:        1.21
-Release:        6%{?dist}
+Release:        7.20160222git0027b3b8e694%{?dist}
 Summary:        Game where you control a marble with the mouse
 
-Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.nongnu.org/enigma/
-Source0:        http://downloads.sourceforge.net/enigma-game/enigma-%{version}.tar.gz
+# Using a git snapshot for the C++11 fixes.
+# git clone https://github.com/Enigma-Game/Enigma.git
+# cd Enigma
+# git checkout 0027b3b8e694c8db75b5f8f825dada449ac2a6d1
+# git archive --prefix=enigma-git0027b3b8e694/ 0027b3b8e694c8db75b5f8f825dada449ac2a6d1 | xz -9 > enigma-git0027b3b8e694.tar.xz
+Source0:        enigma-git0027b3b8e694.tar.xz
+#Source0:        http://downloads.sourceforge.net/enigma-game/enigma-%{version}.tar.gz
 Patch1:         0001-Clean-up-.desktop-file-categories.patch
 Patch2:         0002-build-use-system-zipios.patch
 Patch3:         0003-prevent-ImageMagick-inserting-timestamps-to-PNGs.patch
+Patch4:         0004-src-lev-Proxy.cc-fix-check-for-basic_ifstream-s-read.patch
 
 Requires:       %{name}-data = %{version}-%{release}
 Requires:       dejavu-sans-fonts
 
+BuildRequires:  gcc-c++
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_image-devel
 BuildRequires:  SDL_mixer-devel
@@ -30,6 +37,7 @@ BuildRequires:  git
 BuildRequires:  autoconf automake
 BuildRequires:  zipios++-devel
 BuildRequires:  pkgconfig(libenet)
+BuildRequires:  texi2html
 
 %description
 Enigma is a tribute to and a re-implementation of one of the most
@@ -48,7 +56,7 @@ BuildArch:      noarch
 Data files (levels, graphics, sound, music) and documentation for Enigma.
 
 %prep
-%autosetup -S git_am
+%autosetup -S git_am -n enigma-git0027b3b8e694
 rm -r lib-src/zipios++ lib-src/enet/*
 
 %build
@@ -100,6 +108,12 @@ fi
 %{_datadir}/enigma
 
 %changelog
+* Mon Feb 22 2016 Michal Schmidt <mschmidt@redhat.com> 1.21-7.20160222git0027b3b8e694
+- Update to current git snapshot.
+- Fix FTBFS.
+- BuildRequires: texi2html
+- Drop Group tag.
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild