From c30c5b8d09e9f572983bcf332827c0b843135f9655a0f093f93192d600525e15 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Mon, 25 Feb 2013 10:21:50 +0000
Subject: [PATCH] Accepting request 156238 from home:Mailaender:branches:games

update to latest version
silenced some RPMlint warnings

OBS-URL: https://build.opensuse.org/request/show/156238
OBS-URL: https://build.opensuse.org/package/show/games/SDL_mixer?expand=0&rev=19
---
 SDL_mixer-1.2.11-repack.tar.bz2 |  3 ---
 SDL_mixer-1.2.12.tar.gz         |  3 +++
 SDL_mixer.changes               | 17 +++++++++++++++++
 SDL_mixer.spec                  | 22 +++++++++++++---------
 4 files changed, 33 insertions(+), 12 deletions(-)
 delete mode 100644 SDL_mixer-1.2.11-repack.tar.bz2
 create mode 100644 SDL_mixer-1.2.12.tar.gz

diff --git a/SDL_mixer-1.2.11-repack.tar.bz2 b/SDL_mixer-1.2.11-repack.tar.bz2
deleted file mode 100644
index 40bf734..0000000
--- a/SDL_mixer-1.2.11-repack.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b994aad5dbb1d80093cda0bf193f24686dc4ce63ae421585b166db2d9771f308
-size 523290
diff --git a/SDL_mixer-1.2.12.tar.gz b/SDL_mixer-1.2.12.tar.gz
new file mode 100644
index 0000000..d64b315
--- /dev/null
+++ b/SDL_mixer-1.2.12.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a
+size 3707781
diff --git a/SDL_mixer.changes b/SDL_mixer.changes
index 3f0048c..f5a81e4 100644
--- a/SDL_mixer.changes
+++ b/SDL_mixer.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sun Feb 24 09:35:38 UTC 2013 - mailaender@opensuse.org
+
+- Update to 1.2.12
+  * SDL_mixer is now under the zlib license
+  * Fixed seek offset with SMPEG (was relative, should be absolute)
+  * Added Mix_LoadMUSType_RW() so you can tell SDL_mixer what type the music is
+  * Added /usr/local/share/timidity to the timidity data path
+  * Fixed timidity loading of some MIDI files
+  * Fixed dropping audio in the FLAC audio decoding
+  * Fixed memory leak in SDL_LoadMUS()
+  * Removed GPL native MIDI code for new licensing
+  * Fixed drums playing on MIDI channel 16 with timidity
+  * The music-finished hook can start a track immediately
+  * Added support for FluidSynth
+  * Added support for libmodplug (disabled by default)
+
 -------------------------------------------------------------------
 Thu Jan  3 02:18:43 UTC 2013 - crrodriguez@opensuse.org
 
diff --git a/SDL_mixer.spec b/SDL_mixer.spec
index 1710c93..88001e3 100644
--- a/SDL_mixer.spec
+++ b/SDL_mixer.spec
@@ -18,17 +18,16 @@
 
 Name:           SDL_mixer
 BuildRequires:  flac-devel
+BuildRequires:  fluidsynth-devel
 BuildRequires:  libSDL-devel
 BuildRequires:  libmikmod-devel
 BuildRequires:  libvorbis-devel
 Summary:        Sample Mixer Library for SDL
-License:        LGPL-2.1+
+License:        Zlib
 Group:          System/Libraries
-Version:        1.2.11
+Version:        1.2.12
 Release:        0
-# removed VisualC.zip, Watcom-OS2.zip, Xcode.tar.gz from upstream tarball [bnc#508180]
-# removed libmikmod-3.1.12.zip
-Source:         %{name}-%{version}-repack.tar.bz2
+Source:         %{name}-%{version}.tar.gz
 Source1:        baselibs.conf
 Url:            http://www.libsdl.org/projects/SDL_mixer/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -44,7 +43,7 @@ Timidity MIDI, and SMPEG MP3 libraries.
 Summary:        Sample Mixer Library for SDL
 Group:          System/Libraries
 Provides:       SDL_mixer = %{version}
-Obsoletes:      SDL_mixer <= %{version}
+Obsoletes:      SDL_mixer < %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      SDL_mixer-64bit
@@ -65,7 +64,7 @@ Group:          Development/Libraries/C and C++
 Requires:       libSDL-devel
 Requires:       libSDL_mixer-1_2-0 = %{version}
 Provides:       SDL_mixer-devel = %{version}
-Obsoletes:      SDL_mixer-devel <= %{version}
+Obsoletes:      SDL_mixer-devel < %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      SDL_mixer-devel-64bit
@@ -80,11 +79,16 @@ Timidity MIDI, and SMPEG MP3 libraries.
 
 %prep
 %setup -q
+# remove unneccessary files from upstream tarball [bnc#508180] to clean up source RPM
+rm libmikmod-3.1.12.zip
+rm Watcom-OS2.zip
+rm -rf VisualC
+rm -rf Xcode
+rm -rf Xcode-iOS
 
 %build
 %configure --disable-music-mod-shared --disable-music-ogg-shared --disable-music-flac-shared \
-    --disable-static \
-    --with-pic
+           --disable-static --with-pic
 make %{?_smp_mflags}
 
 %install