From 4136dd833258a42750d3b0c730e60ce0b7470884 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Nov 16 2010 13:33:21 +0000 Subject: New upstream, Fix FTBFS. --- diff --git a/.gitignore b/.gitignore index 4e578b4..e404412 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ lilypond-2.12.3.tar.gz +/lilypond-2.13.39.tar.gz diff --git a/lilypond.spec b/lilypond.spec index ab78bcd..0ad0c64 100644 --- a/lilypond.spec +++ b/lilypond.spec @@ -1,6 +1,6 @@ Name: lilypond -Version: 2.12.3 -Release: 3%{?dist} +Version: 2.13.39 +Release: 1%{?dist} Summary: A typesetting system for music notation Group: Applications/Publishing @@ -17,13 +17,13 @@ Requires: ghostscript >= 8.15 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Obsoletes: lilypond-fonts <= 2.12.1-1 -Requires: lilypond-aybabtu-fonts = %{version}-%{release} +#Requires: lilypond-aybabtu-fonts = %{version}-%{release} Requires: lilypond-century-schoolbook-l-fonts = %{version}-%{release} Requires: lilypond-emmentaler-fonts = %{version}-%{release} -Requires: lilypond-feta-fonts = %{version}-%{release} -Requires: lilypond-feta-alphabet-fonts = %{version}-%{release} -Requires: lilypond-feta-braces-fonts = %{version}-%{release} -Requires: lilypond-parmesan-fonts = %{version}-%{release} +#Requires: lilypond-feta-fonts = %{version}-%{release} +#Requires: lilypond-feta-alphabet-fonts = %{version}-%{release} +#Requires: lilypond-feta-braces-fonts = %{version}-%{release} +#Requires: lilypond-parmesan-fonts = %{version}-%{release} Buildrequires: t1utils bison flex ImageMagick gettext tetex BuildRequires: python-devel >= 2.4.0 @@ -41,18 +41,18 @@ LilyPond is an automated music engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files. -%package aybabtu-fonts -Summary: Lilypond aybabtu font -Group: User Interface/X -Requires: fontpackages-filesystem -Requires: lilypond-fonts-common = %{version}-%{release} - -%description aybabtu-fonts -LilyPond is an automated music engraving system. It formats music -beautifully and automatically, and has a friendly syntax for its input -files. - -This is the aybabtu font included in the package. +#%package aybabtu-fonts +#Summary: Lilypond aybabtu font +#Group: User Interface/X +#Requires: fontpackages-filesystem +#Requires: lilypond-fonts-common = %{version}-%{release} +# +#%description aybabtu-fonts +#LilyPond is an automated music engraving system. It formats music +#beautifully and automatically, and has a friendly syntax for its input +#files. +# +#This is the aybabtu font included in the package. %package century-schoolbook-l-fonts Summary: Lilypond Century Schoolbook L fonts @@ -81,63 +81,67 @@ files. These are the emmentaler fonts included in the package. -%package feta-fonts -Summary: Lilypond feta fonts -Group: User Interface/X -Requires: fontpackages-filesystem -Requires: lilypond-fonts-common = %{version}-%{release} - -%description feta-fonts -LilyPond is an automated music engraving system. It formats music -beautifully and automatically, and has a friendly syntax for its input -files. - -These are the feta fonts included in the package. - -%package feta-alphabet-fonts -Summary: Lilypond feta-alphabet fonts -Group: User Interface/X -Requires: fontpackages-filesystem -Requires: lilypond-fonts-common = %{version}-%{release} - -%description feta-alphabet-fonts -LilyPond is an automated music engraving system. It formats music -beautifully and automatically, and has a friendly syntax for its input -files. - -These are the feta-alphabet fonts included in the package. - -%package feta-braces-fonts -Summary: Lilypond feta-braces fonts -Group: User Interface/X -Requires: fontpackages-filesystem -Requires: lilypond-fonts-common = %{version}-%{release} - -%description feta-braces-fonts -LilyPond is an automated music engraving system. It formats music -beautifully and automatically, and has a friendly syntax for its input -files. - -These are the feta-braces fonts included in the package. - -%package parmesan-fonts -Summary: Lilypond parmesan fonts -Group: User Interface/X -Requires: fontpackages-filesystem -Requires: lilypond-fonts-common = %{version}-%{release} - -%description parmesan-fonts -LilyPond is an automated music engraving system. It formats music -beautifully and automatically, and has a friendly syntax for its input -files. - -These are the parmesan fonts included in the package. +#%package feta-fonts +#Summary: Lilypond feta fonts +#Group: User Interface/X +#Requires: fontpackages-filesystem +#Requires: lilypond-fonts-common = %{version}-%{release} + +#%description feta-fonts +#LilyPond is an automated music engraving system. It formats music +#beautifully and automatically, and has a friendly syntax for its input +#files. +# +#These are the feta fonts included in the package. + +#%package feta-alphabet-fonts +#Summary: Lilypond feta-alphabet fonts +#Group: User Interface/X +#Requires: fontpackages-filesystem +#Requires: lilypond-fonts-common = %{version}-%{release} +# +#%description feta-alphabet-fonts +#LilyPond is an automated music engraving system. It formats music +#beautifully and automatically, and has a friendly syntax for its input +#files. +# +#These are the feta-alphabet fonts included in the package. + +#%package feta-braces-fonts +#Summary: Lilypond feta-braces fonts +#Group: User Interface/X +#Requires: fontpackages-filesystem +#Requires: lilypond-fonts-common = %{version}-%{release} +# +#%description feta-braces-fonts +#LilyPond is an automated music engraving system. It formats music +#beautifully and automatically, and has a friendly syntax for its input +#files. +# +#These are the feta-braces fonts included in the package. + +#%package parmesan-fonts +#Summary: Lilypond parmesan fonts +#Group: User Interface/X +#Requires: fontpackages-filesystem +#Requires: lilypond-fonts-common = %{version}-%{release} +# +#%description parmesan-fonts +#LilyPond is an automated music engraving system. It formats music +#beautifully and automatically, and has a friendly syntax for its input +#files. +# +#These are the parmesan fonts included in the package. %package fonts-common Summary: Lilypond fonts common dir Group: User Interface/X Requires: fontpackages-filesystem - +Obsoletes: lilypond-aybabtu-fonts <= 2.12.3-3 +Obsoletes: lilypond-feta-fonts <= 2.12.3-3 +Obsoletes: lilypond-feta-alphabet-fonts <= 2.12.3-3 +Obsoletes: lilypond-feta-braces-fonts <= 2.12.3-3 +Obsoletes: lilypond-parmesan-fonts <= 2.12.3-3 %description fonts-common LilyPond is an automated music engraving system. It formats music @@ -186,11 +190,11 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir mkdir -p $RPM_BUILD_ROOT%{_fontdir} mv $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf/*.otf $RPM_BUILD_ROOT%{_fontdir} -mv $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/type1/*.pfb $RPM_BUILD_ROOT%{_fontdir} +#mv $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/type1/*.pfb $RPM_BUILD_ROOT%{_fontdir} rmdir $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf -rmdir $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/type1 +#rmdir $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/type1 ln -s %{_fontdir} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf -ln -s %{_fontdir} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/type1 +#ln -s %{_fontdir} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/type1 %clean @@ -198,14 +202,14 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/lilypond.info || : -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/music-glossary.info || : +#/sbin/install-info --info-dir=%{_infodir} %{_infodir}/lilypond.info || : +#/sbin/install-info --info-dir=%{_infodir} %{_infodir}/music-glossary.info || : %preun if [ "$1" = "0" ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/lilypond.info || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/music-glossary.info || : +# /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/lilypond.info || : +# /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/music-glossary.info || : fi %files -f %{name}.lang @@ -219,23 +223,12 @@ fi %{_datadir}/vim/vim* %{_infodir}/*.gz %{_mandir}/man1/* -%{_datadir}/omf/lilypond - -%_font_pkg -n aybabtu aybabtu.otf +#%{_datadir}/omf/lilypond %_font_pkg -n century-schoolbook-l CenturySchL*otf %_font_pkg -n emmentaler emmentaler*otf -%_font_pkg -n feta feta1*pfb feta2*pfb - -%_font_pkg -n feta-alphabet feta-alphabet*pfb - -%_font_pkg -n feta-braces feta-braces*pfb - -%_font_pkg -n parmesan parmesan*pfb - - %files fonts-common %doc COPYING %defattr(0644,root,root,0755) @@ -244,6 +237,9 @@ fi %changelog +* Mon Nov 15 2010 Jon Ciesla - 2.13.39-1 +- Update to first Beta for 2.14.x to fix FTBFS BZ 631363. + * Wed Aug 11 2010 David Malcolm - 2.12.3-3 - recompiling .py files against Python 2.7 (rhbz#623331) diff --git a/sources b/sources index 93529d2..c5bbc2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4c6669099461c9383b284c09c465e54 lilypond-2.12.3.tar.gz +f52677e5d382be68b91bbf51d8564c9f lilypond-2.13.39.tar.gz