From 82e5e10587706b02105719c67b9d21f51f024adfc6099e5e7a7c33037ff4beed Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Jan 2015 09:53:13 +0000 Subject: [PATCH 1/2] Drop --with-pic (implicit), edit package summary and description. OBS-URL: https://build.opensuse.org/package/show/games/SDL_sound?expand=0&rev=15 --- SDL_sound.changes | 6 ++++++ SDL_sound.spec | 47 +++++++++++++++++++++++------------------------ 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/SDL_sound.changes b/SDL_sound.changes index 756dc3a..eaa5390 100644 --- a/SDL_sound.changes +++ b/SDL_sound.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 8 09:52:45 UTC 2015 - jengelh@inai.de + +- Improve package summary and description. Drop --with-pic which + is enabled implicitly anyway. + ------------------------------------------------------------------- Mon Nov 11 04:04:25 UTC 2013 - jengelh@inai.de diff --git a/SDL_sound.spec b/SDL_sound.spec index a65f5af..2d07d52 100644 --- a/SDL_sound.spec +++ b/SDL_sound.spec @@ -1,7 +1,7 @@ # # spec file for package SDL_sound # -# 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 @@ -17,16 +17,17 @@ Name: SDL_sound +%define lname libSDL_sound-1_0-1 +Version: 1.0.3 +Release: 0 Summary: Sound Sample Library for SDL (Simple DirectMedia Layer) License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Version: 1.0.3 -Release: 0 Url: http://icculus.org/SDL_sound/ -Source: %{name}-%{version}-nompglib.tar.bz2 +Source: %name-%version-nompglib.tar.bz2 Source2: baselibs.conf -Patch0: %{name}-%{version}-nompglib.patch +Patch0: %name-%version-nompglib.patch BuildRequires: flac-devel BuildRequires: libSDL-devel BuildRequires: libmikmod-devel @@ -44,13 +45,13 @@ play a file or alternatively decode a file and hand back a single pointer to the waveform. SDL_sound also can handle channel conversion on-the-fly and behind-the-scenes. -%package -n libSDL_sound-1_0-1 +%package -n %lname Summary: Sound Sample Library for SDL (Simple DirectMedia Layer) Group: System/Libraries -Provides: SDL_sound = %{version} -Obsoletes: SDL_sound <= %{version} +Provides: SDL_sound = %version +Obsoletes: SDL_sound <= %version -%description -n libSDL_sound-1_0-1 +%description -n %name SDL_sound is a library that handles the decoding of several popular sound file formats, such as wav, ogg mp3 and midi. SDL_sound can just play a file or alternatively decode a file and hand back a single @@ -58,12 +59,12 @@ pointer to the waveform. SDL_sound also can handle channel conversion on-the-fly and behind-the-scenes. %package -n libSDL_sound-devel -Summary: Sound Sample Library for SDL (Simple DirectMedia Layer) +Summary: Development files for the SDL sound sample library Group: Development/Libraries/C and C++ -Requires: libSDL-devel -Requires: libSDL_sound-1_0-1 = %{version} -Provides: SDL_sound-devel = %{version} -Obsoletes: SDL_sound-devel <= %{version} +Requires: %lname = %version +Requires: pkgconfig(sdl) +Provides: SDL_sound-devel = %version +Obsoletes: SDL_sound-devel <= %version %description -n libSDL_sound-devel SDL_sound is a library that handles the decoding of several popular @@ -79,29 +80,27 @@ on-the-fly and behind-the-scenes. %build %configure \ --disable-static \ - --with-pic \ --disable-sdltest \ --disable-smpeg \ --disable-mpglib make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT -rm -f %{buildroot}%{_libdir}/*.la +make install DESTDIR=%buildroot +rm -f "%buildroot/%_libdir"/*.la -%post -n libSDL_sound-1_0-1 -p /sbin/ldconfig - -%postun -n libSDL_sound-1_0-1 -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files -n libSDL_sound-1_0-1 %defattr(-,root,root) %doc CHANGELOG COPYING CREDITS README TODO -%{_libdir}/lib*.so.* +%_libdir/lib*.so.* %files -n libSDL_sound-devel %defattr(-,root,root) -%{_bindir}/playsound* -%{_includedir}/SDL -%{_libdir}/lib*.so +%_bindir/playsound* +%_includedir/SDL/ +%_libdir/lib*.so %changelog From b754ee420de82d3e8ca0eae0d9367b063c69e41d24179d831776762777f413b2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Jan 2015 11:13:08 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/games/SDL_sound?expand=0&rev=16 --- SDL_sound.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDL_sound.spec b/SDL_sound.spec index 2d07d52..192318b 100644 --- a/SDL_sound.spec +++ b/SDL_sound.spec @@ -51,7 +51,7 @@ Group: System/Libraries Provides: SDL_sound = %version Obsoletes: SDL_sound <= %version -%description -n %name +%description -n %lname SDL_sound is a library that handles the decoding of several popular sound file formats, such as wav, ogg mp3 and midi. SDL_sound can just play a file or alternatively decode a file and hand back a single