[lilypond] 2.17.24.

Jon Ciesla limb at fedoraproject.org
Tue Aug 13 17:10:27 UTC 2013


commit b7a18b0890aa729cdf68512a585801a80bebbd8c
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Aug 13 12:05:07 2013 -0500

    2.17.24.

 .gitignore                        |    1 +
 lilypond-2.11.65-python26.patch   |   13 -----
 lilypond-2.12.0-parse-scm.patch   |    5 --
 lilypond-2.15.38-backintime.patch |   22 --------
 lilypond-consts.patch             |   21 -------
 lilypond-gcc43.patch              |  106 -------------------------------------
 lilypond.spec                     |   23 ++++----
 sources                           |    2 +-
 8 files changed, 13 insertions(+), 180 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1751bea..054d6a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@ lilypond-2.12.3.tar.gz
 /lilypond-2.16.0.tar.gz
 /lilypond-2.16.1.tar.gz
 /lilypond-2.16.2.tar.gz
+/lilypond-2.17.24.tar.gz
diff --git a/lilypond.spec b/lilypond.spec
index fb182ae..bd4e03e 100644
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -1,6 +1,6 @@
 Name:		lilypond
-Version:	2.16.2
-Release:	3%{?dist}
+Version:	2.17.24
+Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -8,9 +8,7 @@ License:	GPLv3
 URL:		http://www.lilypond.org
 Source0:	http://download.linuxaudio.org/lilypond/sources/v2.15/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		lilypond-2.11.65-python26.patch
-Patch1:		lilypond-2.21.2-gcc44-relocate.patch
-#Patch2:		lilypond-2.15.38-backintime.patch
+Patch0:		lilypond-2.21.2-gcc44-relocate.patch
 
 Requires:	ghostscript >= 8.15
 Obsoletes: 	lilypond-fonts <= 2.12.1-1
@@ -25,9 +23,11 @@ BuildRequires:  compat-guile18-devel
 BuildRequires:  ghostscript >= 8.15
 BuildRequires:  pango-devel >= 1.12.0
 BuildRequires:  fontpackages-devel
-BuildRequires:	texlive-base
+BuildRequires:	dblatex
+BuildRequires:	texinfo-tex
 BuildRequires:	texi2html
 BuildRequires:	perl-Pod-Parser
+BuildRequires:	rsync
 
 %description
 LilyPond is an automated music engraving system. It formats music
@@ -86,13 +86,8 @@ This contains the directory common to all lilypond fonts.
 %setup -q
 
 %patch0 -p0
-%patch1 -p0
-#%patch2 -p0
 
 %build
-export GUILE=/usr/bin/guile1.8
-export GUILE_CONFIG=/usr/bin/guile1.8-config
-export GUILE_TOOLS=/usr/bin/guile1.8-tools
 %configure --without-kpathsea --disable-checking \
 	--with-ncsb-dir=%{_datadir}/fonts/default/Type1
 make
@@ -135,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS.txt COPYING DEDICATION HACKING INSTALL.txt
-%doc NEWS.txt README.txt ROADMAP THANKS VERSION
+%doc NEWS.txt README.txt ROADMAP VERSION
 %{_bindir}/*
 %{_libdir}/lilypond
 %{_datadir}/lilypond
@@ -156,6 +151,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 13 2013 Jon Ciesla <limburgher at gmail.com> - 2.17.24-1
+- Fix FTBFS, 992140.  Updated to latest as 2.16.x will not build
+- with texlive > 2012.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.16.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 3c67677..3f0d731 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6db27f17d47e4f66a3b0716c65db3041  lilypond-2.16.2.tar.gz
+e1d9e4c0bb56bd99ef38bd786cbd8f68  lilypond-2.17.24.tar.gz


More information about the scm-commits mailing list