X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fout%2Flilypond.spec;h=056d2d1cb3a3acf9b3fccc8d33d544ed16620543;hb=b2cc0ee8300845fbe604b408adb597247464acc9;hp=2f2d909550d2a0cc14690f4fd5169b0d9cadea89;hpb=0a92b605eb18b62d171c97f354c2101109d9e071;p=lilypond.git

diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index 2f2d909550..056d2d1cb3 100644
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,21 +1,32 @@
 Name: lilypond
-Version: 1.2.9
+Version: 1.3.15
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.2.9.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.15.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>
+# get Packager from (undocumented?) ~/.rpmmacros!
+# Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>
 # Icon: lilypond-icon.gif
 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 a music typesetter.  It produces beautiful sheet music
-using a high level description file as input.  LilyPond is part of 
-the GNU Project.
+
+%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
@@ -24,17 +35,17 @@ the GNU Project.
 make all
 ln -s /usr/share/texmf/fonts/tfm/public/cm/ tfm
 
+# 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
-mkdir -p out/examples/
-tar -cf - input/  | tar -C out/examples/ -xf-
 
 strip lily/out/lilypond midi2ly/out/midi2ly
 make prefix="$RPM_BUILD_ROOT/usr" install
@@ -44,6 +55,15 @@ 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
@@ -57,18 +77,10 @@ fi
 
 
 %files
-%doc htmldocs/
-%doc out/examples/
-%doc mutopia/
-
-
 # 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
@@ -83,3 +95,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/