[SDL] 1.2.15 bump

[Petr Pisar]

commit e1f46ea412ad7c307900caffb92454d9a59f749b
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu Feb 23 17:43:32 2012 +0100

    1.2.15 bump

 .gitignore                                  |    1 +
 SDL-1.2.12-disable_yasm.patch               |   11 ---
 SDL-1.2.14-Define__XGetRequest.patch        |   81 ----------------------
 SDL-1.2.14-SDL_BlitCopyOverlap_memcpy.patch |   22 ------
 SDL-1.2.14-audiodriver.patch                |   22 ------
 SDL-1.2.14-byteorder.patch                  |   22 ------
 SDL-1.2.14-linux_2.6_joystick.patch         |   19 -----
 SDL-1.2.14-nasm-2.09-compat.patch           |  100 ---------------------------
 SDL-1.2.14-x11_grab_down_button.patch       |   24 -------
 SDL-1.2.14-xio_error-rh603984.patch         |   26 -------
 SDL.spec                                    |   41 +++---------
 repackage.sh                                |    2 -
 sources                                     |    3 +-
 13 files changed, 11 insertions(+), 363 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2125ce8..a9ae2d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ SDL-1.2.11.tar.gz
 SDL-1.2.12.tar.gz
 SDL-1.2.14.tar.gz
 SDL-1.2.14_repackaged.tar.gz
+/SDL-1.2.15_repackaged.tar.gz
diff --git a/SDL.spec b/SDL.spec
index b17c9a1..8d9d882 100644
--- a/SDL.spec
+++ b/SDL.spec
@@ -1,10 +1,10 @@
 Name:       SDL
-Version:    1.2.14
-Release:    17%{?dist}
+Version:    1.2.15
+Release:    1%{?dist}
 Summary:    A cross-platform multimedia library
 Group:      System Environment/Libraries
 URL:        http://www.libsdl.org/
-# The license of the file src/video/fbcon/riva_mio.h is bad, but the contents
+# The license of the file src/video/fbcon/riva_mmio.h is bad, but the contents
 # of the file has been relicensed to MIT in 2008 by Nvidia for the 
 # xf86_video-nv driver, therefore it can be considered ok.
 License:    LGPLv2+
@@ -13,24 +13,9 @@ License:    LGPLv2+
 Source0:    %{name}-%{version}_repackaged.tar.gz
 Source1:    SDL_config.h
 Source2:    repackage.sh
-Patch0:     SDL-1.2.14-byteorder.patch
-Patch1:     SDL-1.2.12-multilib.patch
-Patch2:     SDL-1.2.12-disable_yasm.patch
-Patch3:     SDL-1.2.14-audiodriver.patch
-# Submitted upstream: http://bugzilla.libsdl.org/show_bug.cgi?id=1009
-Patch4:     SDL-1.2.14-xio_error-rh603984.patch
-# From upstream <http://bugzilla.libsdl.org/show_bug.cgi?id=894>, rh556608
-Patch5:     SDL-1.2.14-x11_grab_down_button.patch
-# Newer Linux has bigger structure for joystick, in upstream, sdl900, rh624241
-Patch6:     SDL-1.2.14-linux_2.6_joystick.patch
-# Do not call memcpy() on overlapping areas, in upstream, sdl1090, rh669844
-Patch7:     SDL-1.2.14-SDL_BlitCopyOverlap_memcpy.patch
-# nasm-2.09 aliased elf to elf32, in upstream, sdl1152, rh678818
-Patch8:     SDL-1.2.14-nasm-2.09-compat.patch
+Patch0:     SDL-1.2.12-multilib.patch
 # Rejected by upstream as sdl1155, rh480065
-Patch9:     SDL-1.2.10-GrabNotViewable.patch
-# Restore compatibility with libX11-1.4.99.1, in upstream, sdl1376, rh782251
-Patch10:    SDL-1.2.14-Define__XGetRequest.patch
+Patch1:     SDL-1.2.10-GrabNotViewable.patch
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  arts-devel
@@ -88,17 +73,8 @@ applications.
 
 %prep
 %setup -q -b0
-%patch0 -p1 -b .byteorder
-%patch1 -p1 -b .multilib
-%patch2 -p1 -b .disable_yasm
-%patch3 -p1 -b .audiodriver
-%patch4 -p1 -b .xio_error
-%patch5 -p1 -b .x11_grab_down_button
-%patch6 -p1 -b .linux_2.6_joystick
-%patch7 -p1 -b .SDL_BlitCopyOverlap_memcpy
-%patch8 -p1 -b .nasm209
-%patch9 -p0 -b .grabnotviewable
-%patch10 -p1 -b .define__xGetRequest
+%patch0 -p1 -b .multilib
+%patch1 -p0 -b .grabnotviewable
 for F in CREDITS; do 
     iconv -f iso8859-1 -t utf-8 < "$F" > "${F}.utf"
     touch --reference "$F" "${F}.utf"
@@ -155,8 +131,9 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_libdir}/lib*.a
 
 %changelog
-* Thu Feb 23 2012 Petr Pisar <ppisar at redhat.com> - 1.2.14-17
+* Thu Feb 23 2012 Petr Pisar <ppisar at redhat.com> - 1.2.15-1
 - Beautify spec code
+- 1.2.15 bump
 
 * Thu Jan 19 2012 Petr Pisar <ppisar at redhat.com> - 1.2.14-16
 - Replace my patch with upstream one (bug #782251)
diff --git a/repackage.sh b/repackage.sh
index a0679bf..44d3a34 100755
--- a/repackage.sh
+++ b/repackage.sh
@@ -23,8 +23,6 @@ version=$1
 
 # files to be removed without the main SDL-<version>/ prefix
 declare -a REMOVE
-REMOVE[${#REMOVE[*]}]="src/joystick/darwin/10.3.9-FIX/IOHIDLib.h"
-REMOVE[${#REMOVE[*]}]="src/joystick/os2/joyos2.h"
 REMOVE[${#REMOVE[*]}]="symbian.zip"
 
 # no changes below this line should be needed
diff --git a/sources b/sources
index 12c3a61..bc58d4f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-e52086d1b508fa0b76c52ee30b55bec4  SDL-1.2.14.tar.gz
-9dd45acd094badaa7f43d00679186f9c  SDL-1.2.14_repackaged.tar.gz
+cf222b5e323b5d0aa972b5d267badb07  SDL-1.2.15_repackaged.tar.gz