rpms/lilypond/F-10 lilypond-2.11.65-python26.patch, NONE, 1.1 lilypond-2.12.0-parse-scm.patch, NONE, 1.1 lilypond.spec, 1.26, 1.27 sources, 1.20, 1.21

[Jon Ciesla]

Author: limb

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

Modified Files:
	lilypond.spec sources 
Added Files:
	lilypond-2.11.65-python26.patch 
	lilypond-2.12.0-parse-scm.patch 
Log Message:
BZ 476836


lilypond-2.11.65-python26.patch:

--- NEW FILE lilypond-2.11.65-python26.patch ---
--- aclocal.m4.orig	2008-12-17 11:20:45.000000000 -0600
+++ aclocal.m4	2008-12-17 11:20:45.000000000 -0600
@@ -988 +988 @@
-    for python in $PYTHON python python2 python2.4 python2.3 python2.2 python2.1 python2.0; do
+    for python in $PYTHON python python2 python 2.6 python2.4 python2.3 python2.2 python2.1 python2.0; do
--- configure.orig	2008-12-17 11:21:51.000000000 -0600
+++ configure	2008-12-17 11:21:51.000000000 -0600
@@ -2696 +2696 @@
-    for python in $PYTHON python python2 python2.4 python2.3 python2.2 python2.1 python2.0; do
+    for python in $PYTHON python python2 python2.6 python2.4 python2.3 python2.2 python2.1 python2.0; do
@@ -4140 +4140 @@
-    for python in $PYTHON python python2 python2.4 python2.3 python2.2 python2.1 python2.0; do
+    for python in $PYTHON python python2 python2.6 python2.4 python2.3 python2.2 python2.1 python2.0; do

lilypond-2.12.0-parse-scm.patch:

--- NEW FILE lilypond-2.12.0-parse-scm.patch ---
--- lily/parse-scm.cc.orig	2008-12-29 12:54:59.000000000 -0600
+++ lily/parse-scm.cc	2008-12-29 12:54:59.000000000 -0600
@@ -43 +43 @@
-  scm_fill_input (port);
+  //scm_fill_input (port);


Index: lilypond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/F-10/lilypond.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- lilypond.spec	8 Sep 2008 17:29:55 -0000	1.26
+++ lilypond.spec	30 Dec 2008 12:59:42 -0000	1.27
@@ -1,13 +1,15 @@
 Name:		lilypond
-Version:	2.11.57
+Version:	2.12.0
 Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
 License:	GPLv2
 URL:		http://www.lilypond.org
-Source0:	http://download.linuxaudio.org/lilypond/sources/v2.10/%{name}-%{version}.tar.gz
+Source0:	http://download.linuxaudio.org/lilypond/sources/v2.12/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:		lilypond-2.11.65-python26.patch
+Patch1:		lilypond-2.12.0-parse-scm.patch
 
 Requires:	ghostscript >= 8.15
 Requires(post): /sbin/install-info
@@ -30,6 +32,8 @@
 %prep
 %setup -q
 
+%patch0 -p0
+%patch1 -p0
 
 %build
 %configure --without-kpathsea --disable-checking \
@@ -92,6 +96,15 @@
 
 
 %changelog
+* Wed Dec 17 2008 Jon Ciesla <limb at jcomserv.net> - 2.12.0-1
+- New upstream, BZ 476836.
+- Fixed Source0 URL.
+- Patched to allow Python 2.6.
+- Patch for parse-scm fix.
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.11.57-2
+- Rebuild for Python 2.6
+
 * Mon Sep 08 2008 Jon Ciesla <limb at jcomserv.net> - 2.11.57-1
 - Upgrade to new upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	8 Sep 2008 17:29:56 -0000	1.20
+++ sources	30 Dec 2008 12:59:42 -0000	1.21
@@ -1 +1 @@
-99e04dcebcf513506ca631630a6c7cd7  lilypond-2.11.57.tar.gz
+592581b3e8e022a8152d3325eefd9e88  lilypond-2.12.0.tar.gz