From dce7765f8e3879d5d004ba841eb3f44b87cdf59d Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Jun 28 2009 18:52:52 +0000 Subject: - Updated to 1.0.9 - Clean rpath - Fix encoding issues - Remove unnecessary direct library dependencies - Add portaudio support --- diff --git a/.cvsignore b/.cvsignore index be031f8..ee97550 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fluidsynth-1.0.8.tar.gz +fluidsynth-1.0.9.tar.gz diff --git a/fluidsynth.spec b/fluidsynth.spec index 4a0c141..c15418e 100644 --- a/fluidsynth.spec +++ b/fluidsynth.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: fluidsynth -Version: 1.0.8 -Release: 3%{?dist} +Version: 1.0.9 +Release: 1%{?dist} URL: http://www.fluidsynth.org/ Source0: http://download.savannah.gnu.org/releases/fluid/fluidsynth-%{version}.tar.gz License: LGPLv2+ @@ -9,10 +9,20 @@ Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: fluidsynth-libs = %{version}-%{release} -BuildRequires: pkgconfig -BuildRequires: alsa-lib-devel ladspa-devel ncurses-devel readline-devel +BuildRequires: alsa-lib-devel BuildRequires: jack-audio-connection-kit-devel +BuildRequires: alsa-lib-devel +BuildRequires: ladspa-devel BuildRequires: lash-devel +BuildRequires: ncurses-devel +BuildRequires: pkgconfig +BuildRequires: portaudio-devel +BuildRequires: readline-devel + +# For documentation: +BuildRequires: docbook-style-xsl +BuildRequires: doxygen +BuildRequires: libxslt %description FluidSynth is a real-time software synthesizer based on the SoundFont @@ -24,7 +34,6 @@ called IIWU Synth). %package libs Summary: Real-time software synthesizer runtime libraries Group: System Environment/Libraries -Requires: lash jack-audio-connection-kit %description libs FluidSynth is a real-time software synthesizer based on the SoundFont @@ -34,7 +43,7 @@ the runtime shared libraries. %package devel Summary: Real-time software synthesizer development files Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: fluidsynth-libs = %{version}-%{release} Requires: pkgconfig %description devel @@ -45,16 +54,32 @@ header files for building programs that link against fluidsynth. %prep %setup -q +# Fix encoding issues: +for f in AUTHORS THANKS; do + iconv -f ISO-8859-1 -t UTF-8 $f > $f.tmp + touch -r $f $f.tmp + %{__mv} -f $f.tmp $f +done + %build %configure --enable-jack-support --enable-ladspa --disable-static +# remove rpath from libtool +%{__sed} -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +%{__sed} -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +# build fluidsynth %{__make} %{?_smp_mflags} +# build docs +%{__make} DOCBOOK_STYLESHEET=%{_datadir}/sgml/docbook/xsl-stylesheets/html/chunk.xsl %{?_smp_mflags} -C doc update-docs + + %install %{__rm} -rf $RPM_BUILD_ROOT -%{__make} DESTDIR=$RPM_BUILD_ROOT install +%{__make} DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/soundfonts -%{__install} -m 444 sf2/*.sf2 $RPM_BUILD_ROOT%{_datadir}/soundfonts +%{__install} -pm 644 sf2/*.sf2 $RPM_BUILD_ROOT%{_datadir}/soundfonts find $RPM_BUILD_ROOT -name \*.la | xargs rm %clean @@ -65,26 +90,33 @@ find $RPM_BUILD_ROOT -name \*.la | xargs rm %postun libs -p /sbin/ldconfig %files -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/fluid* %{_mandir}/man1/* %files libs -%defattr(-,root,root) +%defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README sf2/COPYRIGHT THANKS TODO doc/FluidSynth-LADSPA.pdf %{_libdir}/libfluidsynth.so.1 %{_libdir}/libfluidsynth.so.1.* -%{_datadir}/soundfonts +%{_datadir}/soundfonts/ %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) %doc doc/api doc/html %{_includedir}/fluidsynth.h -%{_includedir}/fluidsynth +%{_includedir}/fluidsynth/ %{_libdir}/libfluidsynth.so %{_libdir}/pkgconfig/* %changelog +* Sun Jun 28 2009 Orcan Ogetbil - 1.0.9-1 +- Updated to 1.0.9 +- Clean rpath +- Fix encoding issues +- Remove unnecessary direct library dependencies +- Add portaudio support + * Tue Feb 24 2009 Fedora Release Engineering - 1.0.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -115,7 +147,7 @@ find $RPM_BUILD_ROOT -name \*.la | xargs rm * Thu Jul 13 2006 Anthony Green 1.0.7-5.a - Remove iiwusynth references. - Don't install .la file. -- Add %doc bits. +- Add %%doc bits. - Move non-numersion version component to release tag. - Fix libs and devel package names. diff --git a/sources b/sources index 49c02b3..e9cfe13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e2abfd2e69fd8b28d965df968d7d44ee fluidsynth-1.0.8.tar.gz +5847552e09528fc91dca88f10cb9391c fluidsynth-1.0.9.tar.gz