patch::: 1.2.13.jcn2

- separate documentation package

13.jcn1

diff --git a/CHANGES b/CHANGES
index 46a78d2ff97315f0c4f208626f6acc56ca2e49b1..143ff34fc6eff5aca40c31fe3d66fb3256f866a8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+13.jcn1
+       - separate documentation package
+
 13.jcn1
        - bf: mudela-book
 

diff --git a/VERSION b/VERSION
index d63ffea93adf41b39ccce06e5929dc6525a12771..c76923f1fa1666722043eacb978016dd4541c561 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=2
 PATCH_LEVEL=13
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index c53c16de089d74f9868c2fd1e65effe3f1a23e56..2733a9d9bcdd293218010a818df7c4e5511a3e83 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -14,6 +14,18 @@ Prereq: tetex
 %description 
 @BLURB@
 
+%package documentation
+Summary: Prebuilt website containing all LilyPond documentation.
+Group: Applications/Publishing
+
+%description documentation
+@BLURB@
+
+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
 %build
@@ -21,17 +33,17 @@ Prereq: tetex
 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
@@ -41,6 +53,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
@@ -54,18 +75,9 @@ 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
@@ -81,3 +93,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/