From 88692988c2edc0d410a1fada9af26ce5a6e2e40f Mon Sep 17 00:00:00 2001
From: Sindre Pedersen Bjørdal <sindrepb@fedoraproject.org>
Date: Apr 13 2009 17:09:20 +0000
Subject: new upstream release


---

diff --git a/.cvsignore b/.cvsignore
index 85320d5..893746a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-solfege-3.14.1.tar.gz
+solfege-3.14.2.tar.gz
diff --git a/solfege.spec b/solfege.spec
index dc7a1bb..ed122b6 100644
--- a/solfege.spec
+++ b/solfege.spec
@@ -1,6 +1,6 @@
 Name:		solfege
-Version:	3.14.1       
-Release:	3%{?dist}
+Version:	3.14.2      
+Release:	1%{?dist}
 Summary:	Music education software
 
 Group:		Applications/Multimedia
@@ -8,8 +8,6 @@ License:	GPLv3
 URL:		http://www.solfege.org/
 Source0:	http://dl.sourceforge.net/solfege/%{name}-%{version}.tar.gz
 Source1:	solfege.sh.in
-#don't require X to build from Tom Cato Amundsen, to be merged upstream
-Patch0:         solfege-%{version}-no-x.patch
 #make sure desktop file is sane, don't use extension without path in Icon=
 Patch1:         solfege-%{version}-desktop.patch
 
@@ -30,7 +28,6 @@ interval, scale and chord skills. Solfege - Smarten your ears!
 
 %prep
 %setup -q
-%patch0 -p0
 %patch1 -p0
 
 #preserve timestamps
@@ -89,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 13 2009 Sindre Pedersen Bjørdal <sindrepb@fedoraproject.org> - 3.14.2-1
+- New upstream release
+- No-X patch merged upstream, remove it.
+
 * Sat Apr 11 2009 Sindre Pedersen Bjørdal <sindrepb@fedoraproject.org> - 3.14.1-2
 - Don't depend on lilypond
 
diff --git a/sources b/sources
index bab8c20..9d3a830 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb7720a9c847232fad6c8cd462fa1dcc  solfege-3.14.1.tar.gz
+d3b342867f8f7d7e8768bd81656559f4  solfege-3.14.2.tar.gz