rpms/solfege/F-10 solfege.spec,1.16,1.17 sources,1.8,1.9

[Sindre Pedersen Bjørdal]

Author: sindrepb

Update of /cvs/pkgs/rpms/solfege/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18517

Modified Files:
	solfege.spec sources 
Log Message:
new upstream


Index: solfege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/F-10/solfege.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- solfege.spec	7 Apr 2009 14:20:30 -0000	1.16
+++ solfege.spec	29 May 2009 13:32:06 -0000	1.17
@@ -1,5 +1,5 @@
 Name:		solfege
-Version:	3.14.1       
+Version:	3.14.2      
 Release:	1%{?dist}
 Summary:	Music education software
 
@@ -8,19 +8,17 @@ 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
+Patch1:         solfege-3.14.1-desktop.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	texinfo, swig, gettext, docbook-style-xsl 
 BuildRequires:	pygtk2-devel >= 2.12, libxslt
-BuildRequires:  lilypond, swig
+BuildRequires:  swig
 BuildRequires:	desktop-file-utils, gettext
 
-Requires:	timidity++, lilypond
+Requires:	timidity++
 Requires:       gnome-python2-gtkhtml2, esound
 Requires:	pygtk2 >= 2.12
 
@@ -30,7 +28,6 @@ interval, scale and chord skills. Solfeg
 
 %prep
 %setup -q
-%patch0 -p0
 %patch1 -p0
 
 #preserve timestamps
@@ -89,6 +86,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 13 2009 Sindre Pedersen Bjørdal <sindrepb at 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 at fedoraproject.org> - 3.14.1-2
+- Don't depend on lilypond
+
+* Wed Apr 7 2009 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 3.14.1-2
+- Update launcher script to use esdcompat and not esd
+
 * Wed Apr 7 2009 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 3.14.1-1
 - New upstream release
 - Add patch to not require X to build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Apr 2009 14:20:30 -0000	1.8
+++ sources	29 May 2009 13:32:06 -0000	1.9
@@ -1 +1 @@
-bb7720a9c847232fad6c8cd462fa1dcc  solfege-3.14.1.tar.gz
+d3b342867f8f7d7e8768bd81656559f4  solfege-3.14.2.tar.gz