X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fout%2Flilypond.spec;h=50e15ffa17c72dd4033ce1bb8850c6c38e7493b7;hb=d1965f31e75a5e1e9faeb995ef2d37ce5fb3ff85;hp=ce326544e1b2968b0ed777aa1a0a995a718f64d3;hpb=520a456625142476a1872d3b2450b6b24f7abadd;p=lilypond.git

diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index ce326544e1..50e15ffa17 100644
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 1.1.69
+Version: 1.2.14
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.69.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.2.14.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>
@@ -17,7 +17,20 @@ 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
+
+%description documentation
+
+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.
 
+The documentation package is rather big, due to the many pictures and
+different documentation formats.  It is really a rip-off from the
+LilyPond website.  If you have direct internet access, you may always
+read the documentation documentation there: http://www.lilypond.org.
 
 %prep
 %setup
@@ -26,17 +39,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
@@ -46,6 +59,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
+tar -C htmldocs -xzf out/htmldoc.tar.gz
+mkdir -p out/examples/
+tar -cf - input/  | tar -C out/examples/ -xf-
+
 %post
 
 touch /tmp/.lilypond-install
@@ -59,18 +81,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
@@ -85,3 +99,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/