From a4832c2eff7fae8a45f4ab08dad3326b844aa13b Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 20 Jan 2003 21:51:26 +0000
Subject: [PATCH] release commit
---
ChangeLog | 5 +++++
VERSION | 2 +-
make/lilypond.redhat.spec.in | 11 ++++++-----
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4182d61d8c..26bf36c9e2 100644
--- 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 4125dc3901..8cf5ff1a49 100644
--- 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 bb51d3d39e..5d32fa5b4c 100644
--- 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/
--
2.39.5