From: Graydon, Tracy <tracy.graydon@intel.com>
Date: Wed, 24 Jul 2013 00:45:22 +0000 (-0700)
Subject: Fix a merge issue
X-Git-Tag: accepted/tizen/20130724.121857^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1fd57295f56bc115b302532e6ed8684a5e002be;p=platform%2Fupstream%2FSDL.git

Fix a merge issue
---

c1fd57295f56bc115b302532e6ed8684a5e002be
diff --cc packaging/SDL.spec
index 957edb3,272dd17..7f2fef9
--- a/packaging/SDL.spec
+++ b/packaging/SDL.spec
@@@ -9,9 -9,6 +9,7 @@@ Url:            http://www.libsdl.org
  Group:          System/Libraries
  Source:         http://www.libsdl.org/release/SDL-%{version}.tar.gz
  Source2:        baselibs.conf
 +Source1001: 	SDL.manifest
- # PATCH-FIX-OPENSUSE SDL-1.2.13-x11-keytounicode.patch
- Patch0:         SDL-1.2.13-x11-keytounicode.patch
  BuildRequires:  autoconf
  BuildRequires:  gcc-c++
  BuildRequires:  libpulse-devel
@@@ -60,8 -57,6 +58,7 @@@ library
  
  %prep
  %setup -q
 +cp %{SOURCE1001} .
- %patch0
  
  # remove the file to provide sufficient evidence that we are
  # not using this file during the build [bnc#508111]