From ade4a195e84355005966801591559ed558685e6bfb0a11b8f2986b88f5904451 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 28 May 2009 21:36:18 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/SDL_mixer?expand=0&rev=13 --- SDL_mixer.changes | 5 +++ SDL_mixer.spec | 77 +++++++++++++++++++++++++++++------------------ baselibs.conf | 3 +- 3 files changed, 54 insertions(+), 31 deletions(-) diff --git a/SDL_mixer.changes b/SDL_mixer.changes index 35c78a0..662d26f 100644 --- a/SDL_mixer.changes +++ b/SDL_mixer.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 20 16:12:36 CEST 2009 - prusnak@suse.cz + +- follow Shared Library Policy + ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de diff --git a/SDL_mixer.spec b/SDL_mixer.spec index 60fe9df..e645bf6 100644 --- a/SDL_mixer.spec +++ b/SDL_mixer.spec @@ -1,7 +1,7 @@ # # spec file for package SDL_mixer (Version 1.2.8) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -19,34 +19,18 @@ Name: SDL_mixer -BuildRequires: SDL-devel libmikmod-devel libogg-devel libvorbis-devel +BuildRequires: libSDL-devel libmikmod-devel libogg-devel libvorbis-devel Summary: Sample Mixer Library for SDL Version: 1.2.8 -Release: 153 +Release: 154 License: LGPL v2.1 or later Group: System/Libraries -# bug437293 -%ifarch ppc64 -Obsoletes: SDL_mixer-64bit -%endif -# Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-timidity_cfg.patch Patch1: %{name}-%{version}-64bit-fix.patch Url: http://www.libsdl.org/projects/SDL_mixer/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package devel -License: LGPL v2.1 or later -Requires: %{name} = %{version} SDL-devel -Summary: Sample Mixer Library for SDL - files mandatory for development -Group: Development/Libraries/C and C++ -# bug437293 -%ifarch ppc64 -Obsoletes: SDL_mixer-devel-64bit -%endif -# - %description A multichannel audio mixer. It supports four channels of 16-bit stereo audio, plus a single channel of music, mixed by the popular MikMod MOD, @@ -54,7 +38,38 @@ Timidity MIDI, and SMPEG MP3 libraries. -%description devel +%package -n libSDL_mixer-1_2-0 +Summary: Sample Mixer Library for SDL +Group: System/Libraries +License: LGPL v2.1 or later +Provides: SDL_mixer = %{version} +Obsoletes: SDL_mixer < %{version} +# bug437293 +%ifarch ppc64 +Obsoletes: SDL_mixer-64bit +%endif + +%description -n libSDL_mixer-1_2-0 +A multichannel audio mixer. It supports four channels of 16-bit stereo +audio, plus a single channel of music, mixed by the popular MikMod MOD, +Timidity MIDI, and SMPEG MP3 libraries. + + + +%package -n libSDL_mixer-devel +License: LGPL v2.1 or later +Requires: %{name} = %{version} SDL-devel +Summary: Sample Mixer Library for SDL - files mandatory for development +Group: Development/Libraries/C and C++ +Requires: libSDL_mixer-1_2-0 = %{version} libSDL-devel +Provides: SDL_mixer-devel = %{version} +Obsoletes: SDL_mixer-devel < %{version} +# bug437293 +%ifarch ppc64 +Obsoletes: SDL_mixer-devel-64bit +%endif + +%description -n libSDL_mixer-devel A multi-channel audio mixer. It supports 4 channels of 16-bit stereo audio, plus a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI, and SMPEG MP3 libraries. @@ -62,12 +77,14 @@ Timidity MIDI, and SMPEG MP3 libraries. %prep -%setup -q +%setup -q %patch0 %patch1 %build -%configure --disable-static --with-pic\ +%configure \ + --disable-static \ + --with-pic \ --enable-music-libmikmod make %{?jobs:-j %jobs} @@ -78,28 +95,30 @@ rm -f %{buildroot}%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post -n libSDL_mixer-1_2-0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libSDL_mixer-1_2-0 -p /sbin/ldconfig -%files +%files -n libSDL_mixer-1_2-0 %defattr(-,root,root) %doc README CHANGES COPYING -%{_bindir}/play* %{_libdir}/*.so.* -%files devel +%files -n libSDL_mixer-devel %defattr(-,root,root) +%{_bindir}/play* %{_includedir}/SDL/* %{_libdir}/*.so %changelog +* Wed May 20 2009 prusnak@suse.cz +- follow Shared Library Policy * Wed Dec 10 2008 olh@suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) * Thu Oct 30 2008 olh@suse.de - obsolete old -XXbit packages (bnc#437293) -* Sat Jul 05 2008 crrodriguez@suse.de +* Sun Jul 06 2008 crrodriguez@suse.de - remove unusable static libraries - cleanup BuildRequires and -devel package dependencies * Thu Apr 10 2008 ro@suse.de @@ -127,7 +146,7 @@ rm -rf $RPM_BUILD_ROOT * libmikmod.patch (included in update) * Sun Jul 22 2007 aj@suse.de - Cleanup BuildRequires. -* Sat Apr 14 2007 dmueller@suse.de +* Sun Apr 15 2007 dmueller@suse.de - fix requires of devel package again * Wed Apr 11 2007 sbrabec@suse.cz - Require just created libmikmod-devel instead of libmikmod. diff --git a/baselibs.conf b/baselibs.conf index 4b7b844..34abf2c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1 @@ -SDL_mixer -SDL_mixer-devel +libSDL_mixer-1_2-0