From 4319060a13ddcfdfca043124e86d8227cd53d28e9b9c6f37e8cb5a78568e6e19 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 6 Jan 2015 12:27:47 +0000 Subject: [PATCH 1/3] Update descriptions. Enable modplug. OBS-URL: https://build.opensuse.org/package/show/games/SDL_mixer?expand=0&rev=30 --- SDL_mixer.changes | 7 ++++++ SDL_mixer.spec | 55 +++++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/SDL_mixer.changes b/SDL_mixer.changes index 6752d25..58ed6ed 100644 --- a/SDL_mixer.changes +++ b/SDL_mixer.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 6 12:27:02 UTC 2015 - jengelh@inai.de + +- Improve package summary and description +- Drop --with-pic which is enabled implicitly anyway +- Enable modplug support + ------------------------------------------------------------------- Sat Nov 23 19:19:39 UTC 2013 - bwiedemann@suse.com diff --git a/SDL_mixer.spec b/SDL_mixer.spec index d5db3c4..d92b625 100644 --- a/SDL_mixer.spec +++ b/SDL_mixer.spec @@ -1,7 +1,7 @@ # # spec file for package SDL_mixer # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,11 +18,11 @@ Name: SDL_mixer %define lname libSDL_mixer-1_2-0 -Summary: Sample Mixer Library for SDL -License: Zlib -Group: Development/Libraries/C and C++ Version: 1.2.12 Release: 0 +Summary: SDL sound mixer library +License: Zlib +Group: Development/Libraries/C and C++ Url: http://libsdl.org/projects/SDL_mixer/release-1.2.html Source: http://libsdl.org/projects/SDL_mixer/release/%name-%version.tar.gz @@ -34,12 +34,13 @@ Patch2: mikmod2.patch # PATCH-FIX-UPSTREAM: http://hg.libsdl.org/SDL_mixer/rev/2d713670db9b Patch3: double-free-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: flac-devel -BuildRequires: fluidsynth-devel -BuildRequires: libSDL-devel -BuildRequires: libmikmod-devel -BuildRequires: libvorbis-devel BuildRequires: pkgconfig +BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(fluidsynth) +BuildRequires: pkgconfig(libmikmod) +BuildRequires: pkgconfig(libmodplug) >= 0.8.7 +BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(vorbis) %description A multichannel audio mixer. It supports four channels of 16-bit stereo @@ -47,10 +48,10 @@ audio, plus a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI, and SMPEG MP3 libraries. %package -n %lname -Summary: Sample Mixer Library for SDL +Summary: Simple DirectMedia Layer – Sound mixer library Group: System/Libraries -Provides: SDL_mixer = %{version} -Obsoletes: SDL_mixer < %{version} +Provides: SDL_mixer = %version +Obsoletes: SDL_mixer < %version # bug437293 %ifarch ppc64 Obsoletes: SDL_mixer-64bit @@ -62,13 +63,12 @@ audio, plus a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI, and SMPEG MP3 libraries. %package -n libSDL_mixer-devel -Requires: SDL-devel -Summary: Sample Mixer Library for SDL - files mandatory for development +Summary: Development files for the SDL sound mixer library Group: Development/Libraries/C and C++ -Requires: %lname = %{version} +Requires: %lname = %version Requires: libSDL-devel -Provides: SDL_mixer-devel = %{version} -Obsoletes: SDL_mixer-devel < %{version} +Provides: SDL_mixer-devel = %version +Obsoletes: SDL_mixer-devel < %version # bug437293 %ifarch ppc64 Obsoletes: SDL_mixer-devel-64bit @@ -92,28 +92,27 @@ 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 +%configure --disable-music-mod-shared --disable-music-ogg-shared \ + --disable-music-flac-shared --enable-music-modplug --disable-static make %{?_smp_mflags} %install -make install install-bin DESTDIR=$RPM_BUILD_ROOT -rm -f %{buildroot}%{_libdir}/*.la - -%post -n %lname -p /sbin/ldconfig +%make_install install-bin +rm -f "%buildroot/%_libdir"/*.la +%post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname %defattr(-,root,root) %doc README CHANGES COPYING -%{_libdir}/libSDL_mixer-1*.so.* +%_libdir/libSDL_mixer-1*.so.* %files -n libSDL_mixer-devel %defattr(-,root,root) -%{_bindir}/play* -%{_includedir}/SDL/ -%{_libdir}/libSDL_mixer.so -%{_libdir}/pkgconfig/SDL_mixer.pc +%_bindir/play* +%_includedir/SDL/ +%_libdir/libSDL_mixer.so +%_libdir/pkgconfig/SDL_mixer.pc %changelog From 95de8060d0ca19a60dc3b34ec3169db4e4a5f524253c8b9494b9a78a487a73ad Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 6 Jan 2015 12:31:00 +0000 Subject: [PATCH 2/3] enable modplug OBS-URL: https://build.opensuse.org/package/show/games/SDL_mixer?expand=0&rev=31 --- SDL_mixer.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SDL_mixer.spec b/SDL_mixer.spec index d92b625..03a78dd 100644 --- a/SDL_mixer.spec +++ b/SDL_mixer.spec @@ -93,7 +93,8 @@ rm -rf Xcode-iOS %build %configure --disable-music-mod-shared --disable-music-ogg-shared \ - --disable-music-flac-shared --enable-music-modplug --disable-static + --disable-music-flac-shared --enable-music-mod-modplug \ + --disable-static make %{?_smp_mflags} %install From db00f69c061a33bf1fad04429db204358f502552886c1c3358178c0b5781ad24 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Jan 2015 09:34:10 +0000 Subject: [PATCH 3/3] Remove redundant requires OBS-URL: https://build.opensuse.org/package/show/games/SDL_mixer?expand=0&rev=32 --- SDL_mixer.changes | 4 ++-- SDL_mixer.spec | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/SDL_mixer.changes b/SDL_mixer.changes index 58ed6ed..da34af1 100644 --- a/SDL_mixer.changes +++ b/SDL_mixer.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Tue Jan 6 12:27:02 UTC 2015 - jengelh@inai.de -- Improve package summary and description -- Drop --with-pic which is enabled implicitly anyway +- Improve package summary and description. Drop --with-pic which + is enabled implicitly anyway, remove redundant Requires. - Enable modplug support ------------------------------------------------------------------- diff --git a/SDL_mixer.spec b/SDL_mixer.spec index 03a78dd..cc0b661 100644 --- a/SDL_mixer.spec +++ b/SDL_mixer.spec @@ -34,7 +34,7 @@ Patch2: mikmod2.patch # PATCH-FIX-UPSTREAM: http://hg.libsdl.org/SDL_mixer/rev/2d713670db9b Patch3: double-free-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(fluidsynth) BuildRequires: pkgconfig(libmikmod) @@ -66,7 +66,6 @@ Timidity MIDI, and SMPEG MP3 libraries. Summary: Development files for the SDL sound mixer library Group: Development/Libraries/C and C++ Requires: %lname = %version -Requires: libSDL-devel Provides: SDL_mixer-devel = %version Obsoletes: SDL_mixer-devel < %version # bug437293