- up to 1.21

- added build fixes from fedora

diff --git a/0003-prevent-ImageMagick-inserting-timestamps-to-PNGs.patch b/0003-prevent-ImageMagick-inserting-timestamps-to-PNGs.patch
new file mode 100644 (file)
index 0000000..336ee59
--- /dev/null
+++ b/0003-prevent-ImageMagick-inserting-timestamps-to-PNGs.patch
@@ -0,0 +1,25 @@
+From 2d2e2f61b61a10d6fb5c828d0354e9d9c1cb03fa Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 6 Jan 2015 14:33:55 +0100
+Subject: [PATCH 3/3] prevent ImageMagick inserting timestamps to PNGs
+
+---
+ doc/reference/images/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/reference/images/Makefile.am b/doc/reference/images/Makefile.am
+index d1e7f200a5..340af1be03 100644
+--- a/doc/reference/images/Makefile.am
++++ b/doc/reference/images/Makefile.am
+@@ -1,7 +1,7 @@
+ 
+ PNG = first_level.png construction.png ralD006_1.png
+ 
+-CONVERTOPT = -density 112x112 -units PixelsPerCentimeter
++CONVERTOPT = -density 112x112 -units PixelsPerCentimeter -define png:exclude-chunks=date
+ 
+ # Enable out of source build
+ GFXDIR = $(abs_srcdir)/../../../data/gfx48
+-- 
+2.1.0
+

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 (file)
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-desktop.patch b/enigma-desktop.patch
index 774c307d9a1fc4a8795a48e80da54f58c90ce900..812fac7e6653d41057ba0d8869139a984d8ee923 100644 (file)
--- a/enigma-desktop.patch
+++ b/enigma-desktop.patch
@@ -1,21 +1,26 @@
---- enigma-1.20/etc/enigma.desktop.orig        2013-04-01 20:31:57.000000000 +0200
-+++ enigma-1.20/etc/enigma.desktop     2013-11-08 17:54:43.567084557 +0100
-@@ -4,9 +4,11 @@
- 
- Name=Enigma
- Name[eo]=Enigmo
-+Name[pl]=Enigma
- 
- Comment=Uncover pairs of stones while navigating obstacles using a marble
- Comment[eo]=Malkovru parojn de ŝtonojn dum vi navigas obstaklojn kun globeto
-+Comment[pl]=Odkrywanie par kamieni z omijaniem przeszkód przy użyciu kuli
- 
- FilePattern=enigma;
- TryExec=enigma
-@@ -17,5 +19,5 @@
+From d2e77fff6d28ade1f0284fd80cd88bb60c4c27c6 Mon Sep 17 00:00:00 2001
+From: Michael Thomas <wart@fedoraproject.org>
+Date: Wed, 6 Jun 2007 01:50:36 +0000
+Subject: [PATCH 1/2] Clean up .desktop file categories
+
+Clean up .desktop file categories so that it follows the Fedora and
+desktop file standards:
+http://standards.freedesktop.org/menu-spec/latest/apa.html
+---
+ etc/enigma.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/enigma.desktop b/etc/enigma.desktop
+index 9c84137dcb..0b531f1ac2 100644
+--- a/etc/enigma.desktop
++++ b/etc/enigma.desktop
+@@ -44,5 +44,5 @@ Terminal=false
  StartupNotify=false
- 
+ Icon=enigma
  Type=Application
 -Categories=Application;Game;PuzzleGame;
-+Categories=Game;PuzzleGame;
++Categories=Game;LogicGame;
  
+-- 
+2.1.0
+

diff --git a/enigma.spec b/enigma.spec
index 4d19d190154fd0020ead2bc79475f23fca9d50f2..083425b0c5e026424eb9998baadd0a06168e8633 100644 (file)
--- a/enigma.spec
+++ b/enigma.spec
@@ -1,13 +1,15 @@
 Summary:       Oxyd clone
 Summary(pl.UTF-8):     Klon gry Oxyd
 Name:          enigma
-Version:       1.20
+Version:       1.21
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Games
 Source0:       http://downloads.sourceforge.net/enigma-game/%{name}-%{version}.tar.gz
-# Source0-md5: 5871158e07e675d1472f3cfc2a6557ff
+# Source0-md5: d2f4a099a704fdf7f12d024d2b7e6d1b
 Patch0:                %{name}-desktop.patch
+Patch1:                0003-prevent-ImageMagick-inserting-timestamps-to-PNGs.patch
+Patch2:                0004-src-lev-Proxy.cc-fix-check-for-basic_ifstream-s-read.patch
 URL:           http://www.nongnu.org/enigma/
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: SDL_image-devel >= 1.2.0
@@ -56,6 +58,8 @@ blokujących drogę do kamieni Oxyd.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__gettextize}