[timidity++] New upstream release 2.14.0

[Hans de Goede]

commit 6c75d0fe511260843d6463c8564000b031fd06a0
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu Jul 5 15:59:45 2012 +0200

    New upstream release 2.14.0
    
    - Drop all our patches, all 19 are upstream now!

 .gitignore                                         |    1 +
 0001-esd_a-Don-t-start-ESD.patch                   |   47 -
 0002-libao-Add-a-detect-function.patch             |   72 -
 0003-Change-audio-output-detection-order.patch     |   73 -
 0004-Various-man-page-fixes.patch                  |  131 -
 ...idity-.cfg-first-and-then-etc-timidity.cf.patch |  132 -
 ...r-when-we-re-going-to-run-deamonized-in-A.patch |   81 -
 ...a-Fix-compiling-with-recent-flac-versions.patch |   88 -
 ...-of-warning-implicit-declaration-of-funct.patch |  106 -
 ...k-around-soundfonts-with-missing-links-be.patch |  124 -
 0010-Fix-silence-various-compiler-warnings.patch   | 1905 -
 ...g-paths-usr-bin-foo-rather-then-usr-local.patch |   52 -
 ...move-all-autofoo-generated-files-from-git.patch |41422 --------------------
 0013-rename-INSTALL-INSTALL.en.patch               | 1292 -
 ...ofoo-warnings-about-have_speex-ac-cache-i.patch |   27 -
 ...d-of-the-dynamic_control_mode-ControlMode.patch |  294 -
 0016-Silence-dlsym-errors.patch                    |   30 -
 ...ting-of-dynamic-interfaces-in-help-output.patch |   47 -
 ...figure-Don-t-add-lX11-to-the-generic-LIBS.patch |   29 -
 0019-Add-trysource-conf-directive.patch            |  250 -
 sources                                            |    2 +-
 timidity++.spec                                    |   56 +-
 22 files changed, 11 insertions(+), 46250 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e1a4730..941d3ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 TiMidity++-2.13.2.tar.bz2
 /timidity++-cvs20111110.tar.gz
+/TiMidity++-2.14.0.tar.xz
diff --git a/sources b/sources
index 0669e4e..990f5ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21578a4af612fc6fb61172177c675f8f  timidity++-cvs20111110.tar.gz
+27927182d62ba24abbf447a9e9919c53  TiMidity++-2.14.0.tar.xz
diff --git a/timidity++.spec b/timidity++.spec
index 8bc374d..9afd5cc 100644
--- a/timidity++.spec
+++ b/timidity++.spec
@@ -1,38 +1,16 @@
-%global cvs_version cvs20111110
-
 Summary: A software wavetable MIDI synthesizer
 Name: timidity++
-Version: 2.13.2
-Release: 31.%{cvs_version}%{?dist}
-Source0: timidity++-%{cvs_version}.tar.gz
+Version: 2.14.0
+Release: 1%{?dist}
+Source0: http://downloads.sourceforge.net/timidity/TiMidity++-2.14.0.tar.xz
 Source1: fedora-timidity.desktop
 Source2: timidity-xaw.desktop
 URL: http://timidity.sourceforge.net
-Patch1: 0001-esd_a-Don-t-start-ESD.patch
-Patch2: 0002-libao-Add-a-detect-function.patch
-Patch3: 0003-Change-audio-output-detection-order.patch
-Patch4: 0004-Various-man-page-fixes.patch
-Patch5: 0005-Try-etc-timidity-.cfg-first-and-then-etc-timidity.cf.patch
-Patch6: 0006-Fork-earlier-when-we-re-going-to-run-deamonized-in-A.patch
-Patch7: 0007-flac_a-Fix-compiling-with-recent-flac-versions.patch
-Patch8: 0008-Fix-a-bunch-of-warning-implicit-declaration-of-funct.patch
-Patch9: 0009-sndfont-Work-around-soundfonts-with-missing-links-be.patch
-Patch10: 0010-Fix-silence-various-compiler-warnings.patch
-Patch11: 0011-Make-shebang-paths-usr-bin-foo-rather-then-usr-local.patch
-Patch12: 0012-Remove-all-autofoo-generated-files-from-git.patch
-Patch13: 0013-rename-INSTALL-INSTALL.en.patch
-Patch14: 0014-Silence-autofoo-warnings-about-have_speex-ac-cache-i.patch
-Patch15: 0015-Get-rid-of-the-dynamic_control_mode-ControlMode.patch
-Patch16: 0016-Silence-dlsym-errors.patch
-Patch17: 0017-Fix-listing-of-dynamic-interfaces-in-help-output.patch
-Patch18: 0018-configure-Don-t-add-lX11-to-the-generic-LIBS.patch
-Patch19: 0019-Add-trysource-conf-directive.patch
 License: GPLv2
 BuildRequires: alsa-lib-devel ncurses-devel gtk2-devel Xaw3d-devel
 BuildRequires: libao-devel libvorbis-devel flac-devel speex-devel
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: desktop-file-utils
-BuildRequires: automake
 Requires: soundfont2-default hicolor-icon-theme
 # Make sure we get a version of fluid-soundfont-gm (which is the provider of
 # soundfont2-default) which ships with a valid /etc/timidity++.cfg
@@ -61,31 +39,11 @@ The %{name}-Xaw3D-interface package contains a Xaw3D based UI for %{name}.
 
 
 %prep
-%setup -q -n timidity
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-autoreconf -f -i
+%setup -q -n TiMidity++-2.14.0
 
 
 %build
-export EXTRACFLAGS="$RPM_OPT_FLAGS -DCONFIG_FILE1=\\\"/etc/timidity++.cfg\\\" -DCONFIG_FILE2=\\\"/etc/timidity.cfg\\\""
+export EXTRACFLAGS="$RPM_OPT_FLAGS -DCONFIG_FILE=\\\"/etc/timidity++.cfg\\\""
 # Note the first argument to --enable-audio is the default output, and
 # we use libao to get pulse output
 %configure --disable-dependency-tracking \
@@ -159,6 +117,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Jul  5 2012 Hans de Goede <hdegoede at redhat.com> - 2.14.0-1
+- New upstream release 2.14.0
+- Drop all our patches, all 19 are upstream now!
+
 * Mon Apr 30 2012 Hans de Goede <hdegoede at redhat.com> - 2.13.2-31.cvs20111110
 - Provide a new trysource config file directive (rhbz#815611)