From 1d8d2f5d9a4a033cb35f626f9366b5cb4893bf3a Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Jul 27 2012 10:32:14 +0000
Subject: fix FTBFS


- Fix FTBFS. Patches provided by Tom Lane (#843643).
- Remove legacy spec file items.

---

diff --git a/enigma-gcc-4.7-ftbfs.patch b/enigma-gcc-4.7-ftbfs.patch
new file mode 100644
index 0000000..6b3c1f3
--- /dev/null
+++ b/enigma-gcc-4.7-ftbfs.patch
@@ -0,0 +1,12 @@
+diff -Naur enigma-1.01.orig/lib-src/enigma-core/ecl_alist.hh enigma-1.01/lib-src/enigma-core/ecl_alist.hh
+--- enigma-1.01.orig/lib-src/enigma-core/ecl_alist.hh	2007-09-08 08:20:05.000000000 -0400
++++ enigma-1.01/lib-src/enigma-core/ecl_alist.hh	2012-07-26 16:45:04.019992700 -0400
+@@ -61,7 +61,7 @@
+ 	VAL &operator[] (const key_type &key) { 
+             iterator i=find(key);
+             if (i==this->end())
+-                i=insert(this->end(), make_pair(key, VAL()));
++                i=this->insert(this->end(), make_pair(key, VAL()));
+             return i->second;
+         }
+     };
diff --git a/enigma-libpng15.patch b/enigma-libpng15.patch
new file mode 100644
index 0000000..3f32b23
--- /dev/null
+++ b/enigma-libpng15.patch
@@ -0,0 +1,12 @@
+diff -Naur enigma-1.01.orig/lib-src/enigma-core/IMG_SavePNG.c enigma-1.01/lib-src/enigma-core/IMG_SavePNG.c
+--- enigma-1.01.orig/lib-src/enigma-core/IMG_SavePNG.c	2007-09-08 08:20:05.000000000 -0400
++++ enigma-1.01/lib-src/enigma-core/IMG_SavePNG.c	2012-07-26 16:38:56.773717657 -0400
+@@ -84,7 +84,7 @@
+                 png_bytep *row_pointers = 0;
+ 
+                 /* Set error handling. */
+-                if (setjmp(png_ptr->jmpbuf)) {
++                if (setjmp(png_jmpbuf(png_ptr))) {
+                     IMG_SetError("Error writing the PNG file");
+                 }
+                 else {
diff --git a/enigma.spec b/enigma.spec
index 7a0da20..5d0d3c5 100644
--- a/enigma.spec
+++ b/enigma.spec
@@ -1,6 +1,6 @@
 Name:           enigma
 Version:        1.01
-Release:        19
+Release:        20
 Summary:        Clone of the ATARI game Oxyd
 
 Group:          Amusements/Games
@@ -14,7 +14,8 @@ Patch2:         enigma-gcc-4.4-ftbfs.patch
 Patch3:         enigma-consts.patch
 Patch4:         enigma-xerces.patch
 Patch5:         enigma-gcc-4.6-ftbfs.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch6:         enigma-gcc-4.7-ftbfs.patch
+Patch7:         enigma-libpng15.patch
 
 Requires:       %{_datadir}/fonts/dejavu/DejaVuSans.ttf 
 Requires:       %{_datadir}/fonts/dejavu/DejaVuSansCondensed.ttf
@@ -45,14 +46,16 @@ innumerable puzzles blocking your direct way to the Oxyd stones...
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1 -b .gcc46
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %configure --enable-optimize
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT __doc
+rm -rf __doc
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir __doc
 mv $RPM_BUILD_ROOT%{_datadir}/doc/enigma/ __doc
@@ -73,9 +76,6 @@ desktop-file-install \
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
 
@@ -97,6 +97,10 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
 %exclude %{_libdir}/libenet.a
 
 %changelog
+* Fri Jul 27 2012 Michal Schmidt <mschmidt@redhat.com> - 1.01-20
+- Fix FTBFS. Patches provided by Tom Lane (#843643).
+- Remove legacy spec file items.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.01-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild