From 0efd072736c5b0f849628521457e30eb3748cc4288d560cf164c07ab8f377f74 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 6 Jan 2015 12:31:19 +0000 Subject: [PATCH 1/3] Description update OBS-URL: https://build.opensuse.org/package/show/games/SDL2_mixer?expand=0&rev=9 --- SDL2_mixer.changes | 6 ++++++ SDL2_mixer.spec | 41 +++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/SDL2_mixer.changes b/SDL2_mixer.changes index b1f585f..02eb16a 100644 --- a/SDL2_mixer.changes +++ b/SDL2_mixer.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 6 12:27:51 UTC 2015 - jengelh@inai.de + +- Improve package summary and description +- Drop --with-pic which is enabled implicitly anyway + ------------------------------------------------------------------- Wed Aug 28 18:34:49 UTC 2013 - jengelh@inai.de diff --git a/SDL2_mixer.spec b/SDL2_mixer.spec index 7f56ab1..28259d0 100644 --- a/SDL2_mixer.spec +++ b/SDL2_mixer.spec @@ -1,7 +1,7 @@ # # spec file for package SDL2_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 @@ -20,7 +20,7 @@ Name: SDL2_mixer %define lname libSDL2_mixer-2_0-0 Version: 2.0.0 Release: 0 -Summary: Sample Mixer Library for SDL2 +Summary: SDL2 sound mixer library License: Zlib Group: Development/Libraries/C and C++ Url: http://libsdl.org/projects/SDL_mixer/ @@ -28,14 +28,13 @@ Url: http://libsdl.org/projects/SDL_mixer/ #Hg-Clone: http://hg.libsdl.org/SDL_mixer/ Source: http://libsdl.org/projects/SDL_mixer/release/%name-%version.tar.gz Source1: baselibs.conf -BuildRequires: flac-devel -BuildRequires: fluidsynth-devel -BuildRequires: libSDL2-devel -BuildRequires: libmikmod-devel -BuildRequires: libogg-devel -BuildRequires: libvorbis-devel BuildRequires: pkgconfig +BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(fluidsynth) +BuildRequires: pkgconfig(libmikmod) BuildRequires: pkgconfig(libmodplug) >= 0.8.8 +BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(vorbis) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,9 +43,9 @@ 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 SDL2 +Summary: Simple DirectMedia Layer 2 – Sound mixer library Group: System/Libraries -Provides: SDL2_mixer = %{version} +Provides: SDL2_mixer = %version-%release %description -n %lname A multichannel audio mixer. It supports four channels of 16-bit stereo @@ -54,11 +53,11 @@ audio, plus a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI, and SMPEG MP3 libraries. %package -n libSDL2_mixer-devel -Summary: Sample Mixer Library for SDL2 - files mandatory for development +Summary: Development files for the SDL2 sound mixer library Group: Development/Libraries/C and C++ Requires: %lname = %version Requires: libSDL2-devel -Provides: SDL2_mixer-devel = %{version} +Provides: SDL2_mixer-devel = %version-%release %description -n libSDL2_mixer-devel A multi-channel audio mixer. It supports 4 channels of 16-bit stereo @@ -77,29 +76,27 @@ rm -rf external --disable-music-ogg-shared \ --disable-music-flac-shared \ --enable-music-mp3-smpeg-shared \ - --disable-static \ - --with-pic + --disable-static make %{?_smp_mflags} %install -make install install-bin DESTDIR=%{buildroot} -rm -f %{buildroot}%{_libdir}/*.la +%make_install install-bin +rm -f "%buildroot/%_libdir"/*.la # We have these debug tools in SDL_mixer-devel already rm -f "%buildroot/%_bindir"/play* -%post -n %lname -p /sbin/ldconfig - +%post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname %defattr(-,root,root) %doc CHANGES.txt COPYING.txt README.txt -%{_libdir}/libSDL2_mixer-2*.so.* +%_libdir/libSDL2_mixer-2*.so.* %files -n libSDL2_mixer-devel %defattr(-,root,root) -%{_includedir}/SDL2/ -%{_libdir}/libSDL2_mixer.so -%{_libdir}/pkgconfig/SDL2_mixer.pc +%_includedir/SDL2/ +%_libdir/libSDL2_mixer.so +%_libdir/pkgconfig/SDL2_mixer.pc %changelog From 2db3ed8f1c7a0205b9a98301cc58cabec8be670c3c636d995510739a12da6f63 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Jan 2015 09:15:15 +0000 Subject: [PATCH 2/3] pkgconfig's real name is pkg-config OBS-URL: https://build.opensuse.org/package/show/games/SDL2_mixer?expand=0&rev=10 --- SDL2_mixer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDL2_mixer.spec b/SDL2_mixer.spec index 28259d0..fff6d71 100644 --- a/SDL2_mixer.spec +++ b/SDL2_mixer.spec @@ -28,7 +28,7 @@ Url: http://libsdl.org/projects/SDL_mixer/ #Hg-Clone: http://hg.libsdl.org/SDL_mixer/ Source: http://libsdl.org/projects/SDL_mixer/release/%name-%version.tar.gz Source1: baselibs.conf -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(fluidsynth) BuildRequires: pkgconfig(libmikmod) From 7e1e9ab2e8841ee7f373261e7788bbfcfd3a5fb67d4f8c8d63505e5d1afb4470 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Jan 2015 09:34:08 +0000 Subject: [PATCH 3/3] Remove redundant requires OBS-URL: https://build.opensuse.org/package/show/games/SDL2_mixer?expand=0&rev=11 --- SDL2_mixer.changes | 6 +++--- SDL2_mixer.spec | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/SDL2_mixer.changes b/SDL2_mixer.changes index 02eb16a..f6272bf 100644 --- a/SDL2_mixer.changes +++ b/SDL2_mixer.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- -Tue Jan 6 12:27:51 UTC 2015 - jengelh@inai.de +Thu Jan 8 09:33:53 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. ------------------------------------------------------------------- Wed Aug 28 18:34:49 UTC 2013 - jengelh@inai.de diff --git a/SDL2_mixer.spec b/SDL2_mixer.spec index fff6d71..8ccfa49 100644 --- a/SDL2_mixer.spec +++ b/SDL2_mixer.spec @@ -56,7 +56,6 @@ Timidity MIDI, and SMPEG MP3 libraries. Summary: Development files for the SDL2 sound mixer library Group: Development/Libraries/C and C++ Requires: %lname = %version -Requires: libSDL2-devel Provides: SDL2_mixer-devel = %version-%release %description -n libSDL2_mixer-devel