[hydrogen/f13/master] - Update to 0.9.4.2 - Drop all upstreamed patches

[Orcan Ogetbil]

commit c3b44016395bc8177cb6e0e16dd2102ae630d6a8
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Fri Sep 24 02:18:33 2010 -0400

    - Update to 0.9.4.2
    - Drop all upstreamed patches

 .gitignore                  |    1 +
 hydrogen-lib64.patch        |   12 --------
 hydrogen-linking.patch      |   12 --------
 hydrogen-portmidi-200.patch |   32 ---------------------
 hydrogen-qt47.patch         |   11 -------
 hydrogen-snapshot.sh        |   33 ----------------------
 hydrogen.spec               |   32 ++++++--------------
 sources                     |    2 +-
 wasp-linking.patch          |   65 -------------------------------------------
 9 files changed, 12 insertions(+), 188 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ee996db..b2bf17a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 hydrogen-0.9.4.1.tar.gz
+/hydrogen-0.9.4.2.tar.gz
diff --git a/hydrogen.spec b/hydrogen.spec
index 34152de..21fc5ea 100644
--- a/hydrogen.spec
+++ b/hydrogen.spec
@@ -1,21 +1,9 @@
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
-Version:      0.9.4.1
+Version:      0.9.4.2
 Release:      1%{?dist}
 URL:          http://www.hydrogen-music.org/
 Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# For convenience, to take the svn snapshot:
-Source9:      hydrogen-snapshot.sh
-# portmidi-200 needs a new patch. Causes RHBZ#555488
-Patch0:       hydrogen-portmidi-200.patch
-# Fix DSO linking. RHBZ#564719. Sent to upstream ML:
-Patch1:       hydrogen-linking.patch
-# Fix ladspa plugin path in 64bit systems
-Patch2:       hydrogen-lib64.patch
-# Fix wasp ladspa plugin linking
-Patch3:       wasp-linking.patch
-# Fix qt-4.7 build issue
-Patch4:       hydrogen-qt47.patch
 License:      GPLv2+
 Group:        Applications/Multimedia
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,17 +47,13 @@ WASP is now part of the hydrogen drum machine.
 
 
 %prep
-%setup -q -n %{version}
+%setup -q
 patch -p0 < patches/portaudio.patch
-%if 0%{fedora} < 13
-patch -p0 < patches/portmidi.patch
-%else
-%patch0 -p1 -b .200
+%if 0%{fedora} > 12
+# portmidi build fix. Looks like other distros did not obey upstream decisions
+sed -i '/porttime/d' Sconstruct
 %endif
-%patch1 -p1 -b .linking
-%patch2 -p1 -b .lib64
-%patch3 -p1 -b .wasp.linking
-%patch4 -p1 -b .qt47
+
 
 %build
 export QTDIR=%{_qt4_prefix}
@@ -143,6 +127,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Sep 24 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4.2-1
+- Update to 0.9.4.2
+- Drop all upstreamed patches
+
 * Sat Apr 10 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4.1-1
 - Update to 0.9.4.1
 - Build the wasp plugins
diff --git a/sources b/sources
index c3c576a..7c73142 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a328cc1286934747172e2e92e58bc1f4  hydrogen-0.9.4.1.tar.gz
+11759bce8193234b8393db6539aa287f  hydrogen-0.9.4.2.tar.gz