From f83c09b6cf0376d3bdec28b9e0095ab86fdc6352 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Feb 04 2009 18:08:19 +0000 Subject: - add enigma-gcc-4.4-ftbfs.patch from debian --- diff --git a/enigma-gcc-4.4-ftbfs.patch b/enigma-gcc-4.4-ftbfs.patch new file mode 100644 index 0000000..c382b46 --- /dev/null +++ b/enigma-gcc-4.4-ftbfs.patch @@ -0,0 +1,40 @@ +--- enigma-1.01/src/gui/LevelPackComposer.cc~ 2008-11-11 20:42:16.000000000 +0000 ++++ enigma-1.01/src/gui/LevelPackComposer.cc 2008-11-11 20:42:22.000000000 +0000 +@@ -26,6 +26,7 @@ + #include "sound.hh" + #include "video.hh" + #include "lev/Index.hh" ++#include + + #include "main.hh" + +--- enigma-1.01/src/lev/Index.cc~ 2008-11-11 20:43:48.000000000 +0000 ++++ enigma-1.01/src/lev/Index.cc 2008-11-11 20:43:53.000000000 +0000 +@@ -26,6 +26,7 @@ + #include "StateManager.hh" + #include "lev/ScoreManager.hh" + #include "lev/RatingManager.hh" ++#include + + + namespace enigma { namespace lev { +--- enigma-1.01/src/PropertyManager.cc~ 2008-11-11 20:37:48.000000000 +0000 ++++ enigma-1.01/src/PropertyManager.cc 2008-11-11 20:37:57.000000000 +0000 +@@ -28,6 +28,7 @@ + #include "XMLtoLocal.hh" + #include "XMLtoUtf8.hh" + #include "ecl_system.hh" ++#include + #include + #include + #include +--- enigma-1.01/src/StateManager.cc~ 2008-11-11 20:38:28.000000000 +0000 ++++ enigma-1.01/src/StateManager.cc 2008-11-11 20:38:34.000000000 +0000 +@@ -31,6 +31,7 @@ + #include "XMLtoUtf8.hh" + #include "ecl_system.hh" + #include "gui/ErrorMenu.hh" ++#include + #include + #include + #include diff --git a/enigma.spec b/enigma.spec index d3b3b09..363a5f8 100644 --- a/enigma.spec +++ b/enigma.spec @@ -1,6 +1,6 @@ Name: enigma Version: 1.01 -Release: 7.1 +Release: 8.1 Summary: Clone of the ATARI game Oxyd Group: Amusements/Games @@ -9,6 +9,8 @@ URL: http://www.nongnu.org/enigma/ Source0: http://download.berlios.de/enigma-game/enigma-1.01-64bit.tar.gz Patch0: enigma-1.01-desktop.patch Patch1: enigma-gcc-4.3-ftbfs.patch +# taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505358 +Patch2: enigma-gcc-4.4-ftbfs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{_datadir}/fonts/dejavu/DejaVuSans.ttf @@ -36,7 +38,8 @@ innumerable puzzles blocking your direct way to the Oxyd stones... %prep %setup -q %patch0 -p1 -%patch1 +%patch1 -p0 +%patch2 -p1 %build %configure --enable-optimize @@ -88,6 +91,9 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : %exclude %{_libdir}/libenet.a %changelog +* Wed Feb 04 2009 Thorsten Leemhuis - 1.01-8 +- add enigma-gcc-4.4-ftbfs.patch from debian + * Mon Dec 29 2008 Thorsten Leemhuis - 1.01-7 - use file-based deps for fons - use DejaVuSans instead of vera_sans