From 4e2795b953b3df45c99388064f6b8d85c00ae3b6 Mon Sep 17 00:00:00 2001
From: Mystro256 <alexjnewt@hotmail.com>
Date: Jun 12 2018 14:27:17 +0000
Subject: Add upstream patch, fixes rawhide builds


---

diff --git a/mrrescue-1.02e-double-define.patch b/mrrescue-1.02e-double-define.patch
new file mode 100644
index 0000000..c085df7
--- /dev/null
+++ b/mrrescue-1.02e-double-define.patch
@@ -0,0 +1,43 @@
+From ec139833eba2781507cf32d9df30772138a76829 Mon Sep 17 00:00:00 2001
+From: Simon Larsen <simonhffh@gmail.com>
+Date: Wed, 11 May 2016 01:08:29 +0200
+Subject: [PATCH 1/2] Fixed love.conf being doubly defined
+
+---
+ conf.lua | 23 -----------------------
+ 1 file changed, 23 deletions(-)
+
+diff --git a/conf.lua b/conf.lua
+index db46228..8776da4 100644
+--- a/conf.lua
++++ b/conf.lua
+@@ -1,26 +1,3 @@
+-function love.conf(t)
+-    t.identity = "mrrescue"
+-    t.version = "0.10.0"
+-    t.console = false
+-
+-    t.window.title = "Mr. Rescue"
+-    t.window.icon = nil
+-    t.window.width = 256*3
+-    t.window.height = 200*3
+-    t.window.borderless = false
+-    t.window.resizable = false
+-    t.window.fullscreen = false
+-    t.window.fullscreentype = "exclusive"
+-    t.window.vsync = true
+-    t.window.fsaa = 0
+-    t.window.display = 1
+-    t.window.highdpi = false
+-    t.window.srgb = false
+-
+-    t.modules.physics = false
+-    t.modules.mouse = false
+-end
+-
+ function love.conf(t)
+     t.identity = "mrrescue"
+     t.version = "0.10.0"
+-- 
+2.14.4
+
diff --git a/mrrescue-1.02e-love11.patch b/mrrescue-1.02e-love11.patch
index 9ca5cca..f9e4121 100644
--- a/mrrescue-1.02e-love11.patch
+++ b/mrrescue-1.02e-love11.patch
@@ -1,5 +1,5 @@
 From ab23031e0c2faecb77fde1be8a41d6f8ea4e6eda Mon Sep 17 00:00:00 2001
-From: Mystro256 <alexjnewt@hotmail.com>
+From: Mystro256 <alexjnewt at hotmail dot com>
 Date: Sun, 10 Jun 2018 21:19:23 -0400
 Subject: [PATCH] Love 11 support
 
diff --git a/mrrescue.spec b/mrrescue.spec
index 7424a6a..974da99 100644
--- a/mrrescue.spec
+++ b/mrrescue.spec
@@ -1,6 +1,6 @@
 Name:           mrrescue
 Version:        1.02e
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Arcade-style fire fighting game
 
 #See LICENSE file in source for details
@@ -11,9 +11,12 @@ URL:            http://tangramgames.dk/games/mrrescue
 Source0:        https://github.com/SimonLarsen/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 #Patch for appdata, manpage, execution script, and desktop file
 Patch0:         %{name}-appdata.patch
+#Upstream patch:
+#https://github.com/SimonLarsen/mrrescue/commit/ec139833eba2781507cf32d9df30772138a76829
+Patch1:         %{name}-%{version}-double-define.patch
 %if 0%{?fedora} > 28
 #Love 11 patch:
-Patch1:         %{name}-%{version}-love11.patch
+Patch2:         %{name}-%{version}-love11.patch
 %endif
 
 BuildRequires:  desktop-file-utils
@@ -77,6 +80,9 @@ install -p -D -m 0644 %{name}.png \
 %{_datadir}/appdata/*.appdata.xml
 
 %changelog
+* Tue Jun 12 2018 Jeremy Newton <alexjnewt at hotmail dot com> - 1.02e-10
+- Add upstream fix for code duplication (non-functional change)
+
 * Sun Jun 10 2018 Jeremy Newton <alexjnewt at hotmail dot com> - 1.02e-9
 - Add love 11 support