[solfege] - Update to new upstream release (BZ 636475) - Remove upstreamed patch

[chkr]

commit 1ee0794db72344994152bf058d2f375e91ce17a2
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sun Oct 10 23:29:15 2010 +0200

    - Update to new upstream release (BZ 636475)
    - Remove upstreamed patch

 .gitignore   |    1 +
 solfege.spec |   12 ++++++++----
 sources      |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b65d655..3e50e6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 solfege-3.16.4.tar.gz
+/solfege-3.18.3.tar.gz
diff --git a/solfege.spec b/solfege.spec
index 938ff39..9696e2f 100644
--- a/solfege.spec
+++ b/solfege.spec
@@ -1,5 +1,5 @@
 Name:		solfege
-Version:	3.16.4
+Version:	3.18.3
 Release:	1%{?dist}
 Summary:	Music education software
 
@@ -11,8 +11,6 @@ Source0:	http://downloads.sourceforge.net/solfege/%{name}-%{version}.tar.gz
 Patch1:		solfege-3.14.1-desktop.patch
 # use timidity as default
 Patch2:		solfege-3.14.11-default-timidity.patch
-# build fix, http://code.google.com/p/solfege/issues/detail?id=192
-Patch3:		solfege-3.16.4-build-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	texinfo, swig, gettext, docbook-style-xsl 
@@ -32,7 +30,9 @@ interval, scale and chord skills. Solfege - Smarten your ears!
 %setup -q
 %patch1 -p0
 %patch2 -F 1 -p1
-%patch3 -p1
+
+#remove unneeded shebang to make rpmlint happy
+%{__sed} -i.stamp -e 's|#!/usr/bin/python||' solfege/rhythmwidget.py
 
 #preserve timestamps
 %{__sed} -i.stamp -e 's|shutil\.copy|shutil.copy2|' tools/pcopy.py
@@ -83,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 10 2010 Christian Krause <chkr at fedoraproject.org> - 3.18.3-1
+- Update to new upstream release (BZ 636475)
+- Remove upstreamed patch
+
 * Sat Jul 24 2010 Christian Krause <chkr at fedoraproject.org> - 3.16.4-1
 - Update to new upstream release (BZ 617836)
 - Add patch to fix a build problem
diff --git a/sources b/sources
index 985cd79..ee05bcd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c7c4ca1774260ae18e6346d0d1f3c82  solfege-3.16.4.tar.gz
+c5d1f63db2a2a506d46108713e49a516  solfege-3.18.3.tar.gz