Accepting request 280324 from games

OBS-URL: https://build.opensuse.org/request/show/280324
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/SDL_mixer?expand=0&rev=35

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, remove redundant Requires.
+- Enable modplug support
+
 -------------------------------------------------------------------
 Sat Nov 23 19:19:39 UTC 2013 - bwiedemann@suse.com
 

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:  pkg-config
-BuildRequires:  fluidsynth-devel
+BuildRequires:  pkgconfig(flac)
-BuildRequires:  libSDL-devel
+BuildRequires:  pkgconfig(fluidsynth)
-BuildRequires:  libmikmod-devel
+BuildRequires:  pkgconfig(libmikmod)
-BuildRequires:  libvorbis-devel
+BuildRequires:  pkgconfig(libmodplug) >= 0.8.7
-BuildRequires:  pkgconfig
+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}
+Provides:       SDL_mixer = %version
-Obsoletes:      SDL_mixer < %{version}
+Obsoletes:      SDL_mixer < %version
 # bug437293
 %ifarch ppc64
 Obsoletes:      SDL_mixer-64bit
@@ -62,13 +63,11 @@ 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:        Development files for the SDL sound mixer library
-Summary:        Sample Mixer Library for SDL - files mandatory for development
 Group:          Development/Libraries/C and C++
-Requires:       %lname = %{version}
+Requires:       %lname = %version
-Requires:       libSDL-devel
+Provides:       SDL_mixer-devel = %version
-Provides:       SDL_mixer-devel = %{version}
+Obsoletes:      SDL_mixer-devel < %version
-Obsoletes:      SDL_mixer-devel < %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      SDL_mixer-devel-64bit
@@ -92,28 +91,28 @@ rm -rf Xcode
 rm -rf Xcode-iOS
 
 %build
-%configure --disable-music-mod-shared --disable-music-ogg-shared --disable-music-flac-shared \
+%configure --disable-music-mod-shared --disable-music-ogg-shared \
-           --disable-static --with-pic
+	--disable-music-flac-shared --enable-music-mod-modplug \
+	--disable-static
 make %{?_smp_mflags}
 
 %install
-make install install-bin DESTDIR=$RPM_BUILD_ROOT
+%make_install install-bin
-rm -f %{buildroot}%{_libdir}/*.la
+rm -f "%buildroot/%_libdir"/*.la
-
-%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 README CHANGES COPYING
-%{_libdir}/libSDL_mixer-1*.so.*
+%_libdir/libSDL_mixer-1*.so.*
 
 %files -n libSDL_mixer-devel
 %defattr(-,root,root)
-%{_bindir}/play*
+%_bindir/play*
-%{_includedir}/SDL/
+%_includedir/SDL/
-%{_libdir}/libSDL_mixer.so
+%_libdir/libSDL_mixer.so
-%{_libdir}/pkgconfig/SDL_mixer.pc
+%_libdir/pkgconfig/SDL_mixer.pc
 
 %changelog