release commit

diff --git a/ChangeLog b/ChangeLog
index 4182d61d8c806b2ea4d92e39624da85696f7ef2f..26bf36c9e23fc0229a539c514233226b977b0643 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-20  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * make/lilypond.redhat.spec.in: set docdir to %{_docdir}/lilypond/
+       (without version number.)
+
 2003-01-19  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/chord-name.scm: Amy's chord patch.

diff --git a/VERSION b/VERSION
index 4125dc3901e85d69b1c84d98639346f054f2e919..8cf5ff1a492d6e09738237d6924d5c66adf44fb1 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=6
-PATCH_LEVEL=6
+PATCH_LEVEL=7
 MY_PATCH_LEVEL=
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index bb51d3d39ee1a29d573ae4539dcc2e54de9a0eb6..5d32fa5b4cf87eeeb58dfff3d9dab4817dee7e34 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -2,6 +2,7 @@
 
 %define info yes
 
+
 Name: lilypond
 Version: @TOPLEVEL_VERSION@
 Release: 1
@@ -27,7 +28,7 @@ Group: Applications/Publishing
 
 %description documentation
 Documentation and example files of LilyPond. An index is available at
-%{_docdir}/web/Documentation/out-www/index.html
+%{_docdir}/lilypond/index.html
 
 %prep
 %setup
@@ -76,8 +77,8 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
 
 
 # again, make sure that main package installs even if doco fails
-mkdir -p web/out
-tar -C web -xzf out/web.tar.gz 
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/lilypond/
+tar -C $RPM_BUILD_ROOT%{_docdir}/lilypond/ -xzf out/web.tar.gz 
 
 
 %post
@@ -143,7 +144,7 @@ chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 /etc/profile.d/lilypond.*
 
 %files documentation
-
-%doc web/
+%docdir %{_docdir}/lilypond/
+%doc  %{_docdir}/lilypond/