X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fout%2Flilypond.spec;h=622db7d8708ac483596c511cfcb8c22bc98111fc;hb=6fd2c101db89f70b080ec95fc0b458a760bd336a;hp=31d806e60d1ea9529cc6744a59154f99dad4de9e;hpb=194ef0e7e19c7a7c0836b6bd3ed2788a56220d2f;p=lilypond.git

diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index 31d806e60d..622db7d870 100644
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 1.1.41
+Version: 1.3.3
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.41.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.3.tar.gz
 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>
@@ -11,14 +11,21 @@ Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>
 BuildRoot: /tmp/lilypond-install
 Prereq: tetex
 
-%description 
+%description
+LilyPond is a music typesetter.  It produces beautiful
+sheet music using a high level description file as input.  LilyPond is
+part of the GNU Project.
 
-LilyPond is the GNU Project music typesetter.  This program can print
-beautiful sheet music from a music definition file.  It can also play
-mechanical performances to a MIDI file.  Features include multiple
-staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas,
-beams, slurs, triplets, named chords, transposing, formatting scores, 
-part extraction.  It includes a nice font of musical symbols.
+
+%package documentation
+Summary: Prebuilt website containing all LilyPond documentation.
+Group: Applications/Publishing
+# BuildArchitectures: noarch
+
+%description documentation
+
+
+The documentation of LilyPond, both in HTML and PostScript.
 
 %prep
 %setup
@@ -27,54 +34,58 @@ part extraction.  It includes a nice font of musical symbols.
 make all
 ln -s /usr/share/texmf/fonts/tfm/public/cm/ tfm
 
-make -C Documentation info || true
+# 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
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc
-mkdir htmldocs
-tar -C htmldocs -xzf out/htmldoc.tar.gz
-#tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz
 
-strip lily/out/lilypond mi2mu/out/mi2mu
+strip lily/out/lilypond midi2ly/out/midi2ly
 make prefix="$RPM_BUILD_ROOT/usr" install
-gzip -9fn $RPM_BUILD_ROOT/usr/info/* || true
+# gzip -9fn $RPM_BUILD_ROOT/usr/info/* || true
 
 mkdir -p $RPM_BUILD_ROOT/etc/profile.d
 cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT/etc/profile.d/lilypond.sh
 cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
 
+# urg
+#%install documentation
+#line 63: second %install
+# again, make sure that main package installs even if doco fails
+mkdir -p htmldocs/out
+tar -C htmldocs -xzf out/htmldoc.tar.gz || true
+mkdir -p out/examples/
+tar -cf - input/  | tar -C out/examples/ -xf- || true
+
 %post
 
 touch /tmp/.lilypond-install
 rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install
-/sbin/install-info /usr/info/lilypond.info.gz /usr/info/dir || true
+# /sbin/install-info /usr/info/lilypond.info.gz /usr/info/dir || true
 
 %preun
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete /usr/info/lilypond.info.gz /usr/info/dir || true
+ true #   /sbin/install-info --delete /usr/info/lilypond.info.gz /usr/info/dir || true
 fi
 
 
 %files
-%doc htmldocs/
-
 # hairy to hook it in (possibly non-existing) emacs
 %doc mudela-mode.el
 
-# this gets too messy...
-# %doc input/*.ly
-# verbatim include of input: list the directory without issuing a %dir 
-
+/usr/bin/abc2ly
 /usr/bin/convert-mudela
 /usr/bin/mudela-book
 /usr/bin/ly2dvi
 /usr/bin/lilypond
-/usr/bin/mi2mu
-/usr/info/*
-/usr/man/man1/mi2mu.1
+/usr/bin/midi2ly
+/usr/man/man1/midi2ly.1
 /usr/man/man1/lilypond.1
 /usr/man/man1/mudela-book.1
 /usr/man/man1/ly2dvi.1
@@ -83,3 +94,10 @@ fi
 /usr/share/locale/*/LC_MESSAGES/lilypond.mo
 /etc/profile.d/lilypond.*
 
+%files documentation
+# this gets too messy...
+# %doc input/*.ly
+# verbatim include of input: list the directory without issuing a %dir 
+%doc htmldocs/
+%doc out/examples/
+%doc mutopia/