lilypond-1.2.15

diff --git a/CHANGES b/CHANGES
index 2463a44bc16fd1f8f144c9fcf86648fdb46a1bbb..604f59c4aa561ba5f293fc0e3bea1db2c2c39902 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,22 @@
+pl 15  (Oct 18)
+
+14.jcn1
+       - Kludge for accented chars (thanks, Mats)
+       - bf: don't fail on error in doco package
+       - doco package: noarch
+       - bf: standchen: mutopia prep
+
+14.hwn1
+       - move some misc stuff into Documentation/misc/
+       - cleanups: slur & beam.
+       - junked Encompass_info
+       - Smobs -- simplifies sc_elt memory management
+       - Timing_engraver collects bar reqs
+       - unfold all if doing MIDI.
+       - bfs: do something sensible if it doesn't fit.
+       - penalties for break stuff supported.
+
+*******
 13.jcn2,3
        - mutopia/J.S.Bach/Petites-Preludes: bf's and mutopia preraration
        - separate documentation package

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index 2733a9d9bcdd293218010a818df7c4e5511a3e83..74c0e642e9efe9969ed7a05d5130114c9af2a1a5 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -17,6 +17,7 @@ Prereq: tetex
 %package documentation
 Summary: Prebuilt website containing all LilyPond documentation.
 Group: Applications/Publishing
+# BuildArchitectures: noarch
 
 %description documentation
 @BLURB@
@@ -57,10 +58,10 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
 #%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 htmldocs/out
+tar -C htmldocs -xzf out/htmldoc.tar.gz || true
 mkdir -p out/examples/
-tar -cf - input/  | tar -C out/examples/ -xf-
+tar -cf - input/  | tar -C out/examples/ -xf- || true
 
 %post