From 0788f260d032e9c8799af4a2208ccbcff02f6450 Mon Sep 17 00:00:00 2001
From: Rémi Verschelde <rverschelde@gmail.com>
Date: Mar 26 2018 08:59:44 +0000
Subject: Fix inclusion of armv7hl-specific patch in SRPM


---

diff --git a/godot.spec b/godot.spec
index 272ff0a..271b011 100644
--- a/godot.spec
+++ b/godot.spec
@@ -5,7 +5,7 @@
 
 Name:           godot
 Version:        3.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multi-platform 2D and 3D game engine with a feature-rich editor
 # Godot itself is MIT-licensed, the rest is from vendored thirdparty libraries
 License:        MIT and CC-BY and ASL 2.0 and BSD and zlib and OFL and Bitstream Vera Fonts Copyright and ISC and MPLv2.0
@@ -19,11 +19,7 @@ Patch1:         0001-Dist-Fix-Linux-desktop-file-launch-argument.patch
 # Workaround for GCC < 8.1 ICE on armv7hl
 # https://github.com/godotengine/godot/issues/16100
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79085
-%ifarch armv7hl
-%if 0%{?rhel} > 7 || 0%{?fedora} < 29
 Patch2:         godot-3.0.2-workaround-gcc-ice-armv7hl.patch
-%endif
-%endif
 
 # Upstream does not support those arches (for now)
 # aarch64 support might come eventually
@@ -165,7 +161,15 @@ by pointing to the location of the game's data package.
 #----------------------------------------------------------------------
 
 %prep
-%autosetup -p1 -n %{name}-%{uversion}
+%setup -q -n %{name}-%{uversion}
+
+%patch0 -p1 -b .server-linking
+%patch1 -p1 -b .desktop-exec
+%ifarch armv7hl
+%if 0%{?rhel} > 7 || 0%{?fedora} < 29
+%patch2 -p1 -b .armv7hl-gcc-ice
+%endif
+%endif
 
 # Windows-specific
 rm -rf thirdparty/rtaudio
@@ -242,6 +246,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml
 
 %changelog
+* Mon Mar 26 2018 Rémi Verschelde <akien@fedoraproject.org> - 3.0.2-2
+- Fix inclusion of armv7hl-specific patch in SRPM
+
 * Tue Mar 20 2018 Rémi Verschelde <akien@fedoraproject.org> - 3.0.2-1
 - Initial Godot package for Fedora, based on my own Mageia package.
 - Exclude unsupported arches: aarch64 ppc64 ppc64le s390x