[lilypond] 2.15.37. Spec cleanup.

Jon Ciesla limb at fedoraproject.org
Fri Apr 20 12:54:33 UTC 2012


commit 93ef74645b577f061b30420d581f78830d684557
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Apr 20 07:54:19 2012 -0500

    2.15.37.
    Spec cleanup.

 .gitignore    |    1 +
 lilypond.spec |  102 ++++----------------------------------------------------
 sources       |    2 +-
 3 files changed, 10 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac7e7eb..1727e17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ lilypond-2.12.3.tar.gz
 /lilypond-2.15.34.tar.gz
 /lilypond-2.15.35.tar.gz
 /lilypond-2.15.36.tar.gz
+/lilypond-2.15.37.tar.gz
diff --git a/lilypond.spec b/lilypond.spec
index 15e7357..483dea3 100644
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -1,29 +1,20 @@
 Name:		lilypond
-Version:	2.15.36
+Version:	2.15.37
 Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
 License:	GPLv3
 URL:		http://www.lilypond.org
-Source0:	http://download.linuxaudio.org/lilypond/sources/v2.12/%{name}-%{version}.tar.gz
+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.12.0-parse-scm.patch
-Patch2:		lilypond-2.21.2-gcc44-relocate.patch
-#Patch3:		lilypond-consts.patch
+Patch1:		lilypond-2.21.2-gcc44-relocate.patch
 
 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-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}
 
 Buildrequires:  t1utils bison flex ImageMagick gettext tetex
 BuildRequires:  python-devel >= 2.4.0
@@ -41,19 +32,6 @@ 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 century-schoolbook-l-fonts
 Summary:        Lilypond Century Schoolbook L fonts
 Group:          User Interface/X
@@ -81,57 +59,6 @@ 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 fonts-common
 Summary:        Lilypond fonts common dir
@@ -154,9 +81,7 @@ This contains the directory common to all lilypond fonts.
 %setup -q
 
 %patch0 -p0
-#%patch1 -p0
-%patch2 -p0
-#%patch3 -p1
+%patch1 -p0
 
 %build
 %configure --without-kpathsea --disable-checking \
@@ -190,28 +115,14 @@ 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}
 rmdir $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf
-#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
 
 
 %clean
 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 || :
-
-
-%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 || :
-#fi
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS.txt COPYING DEDICATION HACKING INSTALL.txt
@@ -223,7 +134,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vim/vim*
 %{_infodir}/*.gz
 %{_mandir}/man1/*
-#%{_datadir}/omf/lilypond
 
 %_font_pkg -n century-schoolbook-l CenturySchL*otf
 
@@ -237,6 +147,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 20 2012 Jon Ciesla <limburgher at gmail.com> - 2.15.37-1
+- New upstream.
+- Decruft spec.
+
 * Mon Apr 09 2012 Jon Ciesla <limburgher at gmail.com> - 2.15.36-1
 - New upstream.
 
diff --git a/sources b/sources
index ce1d2bb..a079a8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26de643504803da9b22d79d9dbef4e05  lilypond-2.15.36.tar.gz
+329ba738ae585d98d55e0dca6f90f29a  lilypond-2.15.37.tar.gz


More information about the scm-commits mailing list