diff --git a/.gitignore b/.gitignore index 71d2406..c226b38 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ SDL_sound-1.0.3.tar.gz +/SDL_sound-1.0.3-clean.tar.gz diff --git a/SDL_sound.spec b/SDL_sound.spec index 360843f..359caf8 100644 --- a/SDL_sound.spec +++ b/SDL_sound.spec @@ -1,17 +1,19 @@ Name: SDL_sound Version: 1.0.3 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Library handling decoding of several popular sound file formats Group: System Environment/Libraries License: LGPLv2+ URL: http://www.icculus.org/SDL_sound # This is: # http://www.icculus.org/SDL_sound/downloads/%{name}-%{version}.tar.gz -# With all the files except the Makefiles under decoders/mpglib (patented) -# and PBProjects.tar.gz (contains binaries) removed -Source0: %{name}-%{version}.tar.gz +# With PBProjects.tar.gz (contains binaries) removed +Source0: %{name}-%{version}-clean.tar.gz BuildRequires: SDL-devel flac-devel speex-devel libvorbis-devel libogg-devel BuildRequires: mikmod-devel libmodplug-devel physfs-devel doxygen +# SDL_sound uses a very stripped down mpg123-libs called mpglib +Provides: bundled(mpglib) +Provides: bundled(mpg123-libs) %description SDL_sound is a library that handles the decoding of several popular sound file @@ -46,9 +48,10 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %build -# no smpeg and internal mpglib because of patents! +export CFLAGS="$RPM_OPT_FLAGS -D__EXPORT__= -Wno-pointer-sign -Wno-deprecated-declarations" +# no smpeg because of patents! %configure --disable-dependency-tracking --disable-static \ - --disable-smpeg --disable-mpglib --enable-mikmod --enable-ogg \ + --disable-smpeg --enable-mpglib --enable-mikmod --enable-ogg \ --enable-modplug --enable-speex --enable-flac --enable-midi make %{?_smp_mflags} doxygen Doxyfile @@ -93,13 +96,12 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %files -%defattr(-,root,root,-) -%doc COPYING README TODO +%license COPYING +%doc README TODO %{_bindir}/playsound* %{_libdir}/libSDL_sound-1.0.so.* %files devel -%defattr(-,root,root,-) %doc docs/html %{_libdir}/libSDL_sound*.so %{_includedir}/SDL/SDL_sound.h @@ -107,6 +109,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %changelog +* Wed Mar 28 2018 Hans de Goede - 1.0.3-21 +- Fix FTBFS (rhbz#1555579) +- Enable mp3 support now that it is allowed in Fedora (rhbz#1561308) + * Wed Feb 07 2018 Fedora Release Engineering - 1.0.3-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 8bcffb7..088e975 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34d057f4a0cb9bbd267a4e7e050d5a03 SDL_sound-1.0.3.tar.gz +SHA512 (SDL_sound-1.0.3-clean.tar.gz) = 4465194f73782e9db9e33e92b1c79aaa69deb49f2549e68f922d4a83ebcae769e89907113de7854229da407306616f04467f847261815442709bdb4f22e52c08