diff --git a/lilypond-2.11.65-python26.patch b/lilypond-2.11.65-python26.patch new file mode 100644 index 0000000..2e1feb1 --- /dev/null +++ b/lilypond-2.11.65-python26.patch @@ -0,0 +1,13 @@ +--- 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 diff --git a/lilypond-2.12.0-parse-scm.patch b/lilypond-2.12.0-parse-scm.patch new file mode 100644 index 0000000..77e7eaa --- /dev/null +++ b/lilypond-2.12.0-parse-scm.patch @@ -0,0 +1,5 @@ +--- 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); diff --git a/lilypond.spec b/lilypond.spec index 841ee85..71f5c27 100644 --- a/lilypond.spec +++ b/lilypond.spec @@ -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 @@ files. %prep %setup -q +%patch0 -p0 +%patch1 -p0 %build %configure --without-kpathsea --disable-checking \ @@ -92,6 +96,15 @@ fi %changelog +* Wed Dec 17 2008 Jon Ciesla - 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 - 2.11.57-2 +- Rebuild for Python 2.6 + * Mon Sep 08 2008 Jon Ciesla - 2.11.57-1 - Upgrade to new upstream. diff --git a/sources b/sources index acc8c4d..bc69d0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99e04dcebcf513506ca631630a6c7cd7 lilypond-2.11.57.tar.gz +592581b3e8e022a8152d3325eefd9e88 lilypond-2.12.0.tar.gz