rpms/lilypond/FC-5 lilypond-2.10.2-configure.patch, NONE, 1.1 lilypond.spec, 1.10, 1.11

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/lilypond/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21269

Modified Files:
	lilypond.spec 
Added Files:
	lilypond-2.10.2-configure.patch 
Log Message:
Fix broken configure script (it wants guile>=1.6.7, and incorrectly get the version as 1.6 and fails.)

lilypond-2.10.2-configure.patch:

--- NEW FILE lilypond-2.10.2-configure.patch ---
--- lilypond-2.10.2/configure	2006-12-11 18:14:04.000000000 -0600
+++ lilypond-2.10.2.new/configure	2006-12-15 07:44:30.000000000 -0600
@@ -7311,7 +7311,7 @@
     ## grab the first version number in  --version output.
     eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '\(^\| \)[0-9][0-9]*\.[0-9]' \
         | head -n 1 \
-	| tr ' ' '\n' | sed 's/\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g' | grep '\(^\| \)[0-9][0-9]*\.[0-9]' | head -n 1\`\"
+	| tr ' ' '\n' | grep '[0-9]\.[0-9]' | head -n 1 | sed 's/\([0-9.]*\).*/\1/g'\`\"
 
     if test -z "$_ver"; then
         ## If empty, try date [fontforge]


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-5/lilypond.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lilypond.spec	13 Dec 2006 15:08:02 -0000	1.10
+++ lilypond.spec	15 Dec 2006 19:44:22 -0000	1.11
@@ -1,12 +1,13 @@
 Name:		lilypond
 Version:	2.10.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
 License:	GPL
 URL:		http://www.lilypond.org
 Source0:	http://www.lilypond.org/download/v2.8/%{name}-%{version}.tar.gz
+Patch0:		lilypond-2.10.2-configure.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       ghostscript >= 8.15
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -90,6 +92,9 @@
 
 
 %changelog
+* Fri Dec 15 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.2-2
+- Patch broken configure script (it thinks guile 1.6.7 is 1.6 and fails).
+
 * Tue Dec 13 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.2-1
 - Upgrade to 2.10.2. Fixes bug 219254.
 - Update build requirements for 2.10.x.