From: fred <fred>
Date: Tue, 26 Mar 2002 23:56:21 +0000 (+0000)
Subject: lilypond-1.3.92
X-Git-Tag: release/1.5.59~1286
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ee975b709cff798416377a9280662d751c5b4fdc;p=lilypond.git

lilypond-1.3.92
---

diff --git a/input/paddy.abc b/input/paddy.abc
index 6b574944f5..0aadebc63c 100644
--- a/input/paddy.abc
+++ b/input/paddy.abc
@@ -1,3 +1,9 @@
+%
+%  This is NOT a lilypond input file. It is an ABC file, see
+%  http://www.gre.ac.uk/~c.walshaw/abc/
+%  
+%  LilyPond includes import tools for Finale, Musedata, ABC, MIDI and PMX
+%
 X:1
 T:Paddy O'Rafferty
 C:Trad.
diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index 04f3612c8b..8c6f52170d 100644
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -1,7 +1,7 @@
 Name: lilypond
 Version: @TOPLEVEL_VERSION@
 Release: 1
-Copyright: GPL
+License: GPL
 Group: Applications/Publishing
 Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
 Summary: A program for printing sheet music.
@@ -29,17 +29,24 @@ The documentation of LilyPond, both in HTML and PostScript.
 
 %build
 
-%{configure} --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared
+#
 
-make all
+# DO NOT use % { configure } , it hardcodes all paths, runs libtool,
+# so we can't do make prefix=/tmp/ install.
+
+# In fact, do not take out the spaces between % and { , because RPM will gladly
+# do a substitution anyway.
 
-ln -s %{_prefix}/share/texmf/fonts/tfm/public/cm/ tfm
+./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared
+
+make all
 
 # urg
 # %build documentation
 # line 42: second %build
 # ok, now make sure that lilypond package will succeed,
 # even if documentation fails to build
+
 make -C Documentation  || true
 make htmldoc || true
 
@@ -90,23 +97,30 @@ fi
 
 %ifnos cygwin
 %{_prefix}/bin/abc2ly
-%{_prefix}/bin/etf2ly
-%{_prefix}/bin/musedata2ly
-%{_prefix}/bin/pmx2ly
+%{_prefix}/bin/as2text
 %{_prefix}/bin/convert-mudela
-%{_prefix}/bin/mudela-book
-%{_prefix}/bin/ly2dvi
+%{_prefix}/bin/etf2ly
 %{_prefix}/bin/lilypond
+%{_prefix}/bin/ly2dvi
 %{_prefix}/bin/midi2ly
+%{_prefix}/bin/mudela-book
+%{_prefix}/bin/musedata2ly
+%{_prefix}/bin/pmx2ly
 %else
 %{_prefix}/bin
 %endif
 
-%{_prefix}/man/man1/midi2ly.1
-%{_prefix}/man/man1/lilypond.1
-%{_prefix}/man/man1/mudela-book.1
-%{_prefix}/man/man1/ly2dvi.1
-%{_prefix}/man/man1/convert-mudela.1
+%{_prefix}/man/man1/abc2ly.1.gz
+%{_prefix}/man/man1/as2text.1.gz
+%{_prefix}/man/man1/convert-mudela.1.gz
+%{_prefix}/man/man1/etf2ly.1.gz
+%{_prefix}/man/man1/lilypond.1.gz
+%{_prefix}/man/man1/ly2dvi.1.gz
+%{_prefix}/man/man1/midi2ly.1.gz
+%{_prefix}/man/man1/mudela-book.1.gz
+%{_prefix}/man/man1/musedata2ly.1.gz
+%{_prefix}/man/man1/pmx2ly.1.gz
+
 %{_prefix}/share/lilypond/
 %{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo
 # urg?