From 5803e5d582f3a7159f5816d3b7e95f0d834deb0e149b19263a4c1f875af2a2fc Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 19 Oct 2017 06:34:11 +0000
Subject: [PATCH] move to std2

OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=67
---
 SDL-bnc1062784-check-overflow-xcf-props.patch | 2 ++
 SDL2.spec                                     | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SDL-bnc1062784-check-overflow-xcf-props.patch b/SDL-bnc1062784-check-overflow-xcf-props.patch
index c220ece..fe84615 100644
--- a/SDL-bnc1062784-check-overflow-xcf-props.patch
+++ b/SDL-bnc1062784-check-overflow-xcf-props.patch
@@ -1,3 +1,5 @@
+# From: sreeves@suse.com
+# CVE-2017-2888. Check for overflow when computing size.
 # Based on upstream patch: 81a4950907a01359f2f9390875291eb3951e6c6b
 
 Index: SDL2-2.0.6/include/SDL_stdinc.h
diff --git a/SDL2.spec b/SDL2.spec
index 45b1180..a8e285d 100644
--- a/SDL2.spec
+++ b/SDL2.spec
@@ -32,7 +32,6 @@ Source3:        %name.keyring
 Source4:        baselibs.conf
 Patch1:         dbus.diff
 Patch2:         %name-ppc64-declaration-after-statement.patch
-# PATCH-FIX-UPSTREAM SDL-bnc1062784-check-overflow-xcf-props.patch sreeves@suse.com - CVE-2017-2888. Check for overflow when computing size.
 Patch3:         SDL-bnc1062784-check-overflow-xcf-props.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
@@ -107,11 +106,10 @@ library.
 
 %prep
 %setup -q
-%patch -P 1 -p1
+%patch -P 1 -P 3 -p1
 %ifarch ppc64 ppc64le
 %patch -P 2 -p1
 %endif
-%patch -P 3 -p1
 dos2unix WhatsNew.txt
 dos2unix TODO.txt
 dos2unix BUGS.txt