[fluidsynth/f13/master] - Update to 1.1.2 (with cmake)

[Orcan Ogetbil]

commit d8728e3107159b289394406bc255abf52abe5cc4
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Wed Sep 1 02:14:29 2010 -0400

    - Update to 1.1.2 (with cmake)

 .gitignore      |    1 +
 fluidsynth.spec |   76 +++++++++++++++++++++++++-----------------------------
 sources         |    2 +-
 3 files changed, 37 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9c6170..539fd08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 fluidsynth-1.1.1.tar.gz
+/fluidsynth-1.1.2.tar.bz2
diff --git a/fluidsynth.spec b/fluidsynth.spec
index 2a7528d..3c6f155 100644
--- a/fluidsynth.spec
+++ b/fluidsynth.spec
@@ -1,48 +1,48 @@
 Summary:      Real-time software synthesizer
 Name:         fluidsynth
-Version:      1.1.1
+Version:      1.1.2
 Release:      1%{?dist}
 URL:          http://www.fluidsynth.org/
-Source0:      http://download.savannah.gnu.org/releases/fluid/fluidsynth-%{version}.tar.gz
+Source0:      http://downloads.sourceforge.net/fluidsynth/fluidsynth-%{version}.tar.bz2
 License:      LGPLv2+
 Group:        Applications/Multimedia
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:     fluidsynth-libs = %{version}-%{release}
 
 BuildRequires: alsa-lib-devel
+BuildRequires: cmake
+BuildRequires: dbus-devel
 BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: alsa-lib-devel 
 BuildRequires: ladspa-devel
 BuildRequires: lash-devel
 BuildRequires: libsndfile-devel
 BuildRequires: ncurses-devel
 BuildRequires: pkgconfig
 # Disabled for now:
-# http://fluidsynth.resonance.org/trac/ticket/51
+# http://sourceforge.net/apps/trac/fluidsynth/ticket/51
 # BuildRequires: portaudio-devel
 BuildRequires: pulseaudio-libs-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
-2 specifications. It is a "software synthesizer". FluidSynth can read
-MIDI events from the MIDI input device and render them to the audio
-device. It can also play MIDI files (note: FluidSynth was previously
+FluidSynth is a real-time software synthesizer based on the SoundFont 2 
+specifications. It is a "software synthesizer". FluidSynth can read MIDI events
+from the MIDI input device and render them to the audio device. It features 
+real-time effect modulation using SoundFont 2.01 modulators, and a built-in
+command line shell. It can also play MIDI files (note: FluidSynth was previously
 called IIWU Synth).
 
 %package libs
-Summary:   Real-time software synthesizer runtime libraries
+Summary:   Real-time software synthesizer run-time libraries
 Group:     System Environment/Libraries
 
 %description libs
-FluidSynth is a real-time software synthesizer based on the SoundFont
-2 specifications. It is a "software synthesizer". This package holds
-the runtime shared libraries.
+FluidSynth is a real-time software synthesizer based on the SoundFont 2 
+specifications. It is a "software synthesizer". This package holds the run-time
+shared libraries.
 
 %package devel
 Summary:   Real-time software synthesizer development files
@@ -51,55 +51,45 @@ Requires:  fluidsynth-libs = %{version}-%{release}
 Requires:  pkgconfig
 
 %description devel
-FluidSynth is a real-time software synthesizer based on the SoundFont
-2 specifications. It is a "software synthesizer". This package holds
-header files for building programs that link against fluidsynth.
+FluidSynth is a real-time software synthesizer based on the SoundFont 2 
+specifications. It is a "software synthesizer". This package holds 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 --enable-pulse-support --disable-static --disable-portaudio-support
-
-# 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
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} -Denable-ladspa=on ..
+popd
 
 # build fluidsynth
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 # build docs
-%{__make} DOCBOOK_STYLESHEET=%{_datadir}/sgml/docbook/xsl-stylesheets/html/chunk.xsl %{?_smp_mflags} -C doc update-docs
+make doxygen -C %{_target_platform}/doc
 
-# Remove id's from generated docs to avoid multilib conflict (RHBZ#528240)
-sed -i -e 's|<a name="id[0-9]*"></a>||g' \
-       -e 's|<a href="index.html#id[0-9]*">|<a href="index.html">|g' \
-    doc/html/*.html
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
-find $RPM_BUILD_ROOT -name \*.la | xargs rm
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} install
+
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
+
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/fluid*
-%{_mandir}/man1/*
+%{_mandir}/man1/fluidsynth*
 
 %files libs
 %defattr(-,root,root,-)
@@ -109,13 +99,17 @@ find $RPM_BUILD_ROOT -name \*.la | xargs rm
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/api doc/html doc/*.c doc/*.txt
+%doc %{_target_platform}/doc/api/html doc/*.c doc/*fluid*.txt
 %{_includedir}/fluidsynth.h
 %{_includedir}/fluidsynth/
 %{_libdir}/libfluidsynth.so
 %{_libdir}/pkgconfig/*
 
+
 %changelog
+* Wed Sep 01 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.1.2-1
+- Update to 1.1.2 (with cmake)
+
 * Sat Jan 30 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.1.1-1
 - Update to 1.1.1
 
diff --git a/sources b/sources
index 75210a0..164ed44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0db3da78028d255026230809c6e21b44  fluidsynth-1.1.1.tar.gz
+5001d86c96d2aa9278314087226dabae  fluidsynth-1.1.2.tar.bz2