* make/lilypond-vars.make: remove stepmake compat glue.

[lilypond.git] / make / lilypond.redhat.spec.in

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index b4821c51b3c5cd1a08d3efa5dcb3a21f17ce4429..50924da8e848c09f8f41023ee9832f5a3aa89e6e 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -14,10 +14,11 @@ URL: http://www.lilypond.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
-Buildrequires: t1utils bison flex mftrace
+Buildrequires: t1utils bison flex mftrace ImageMagick
 Buildrequires: texinfo >= 4.6
-Requires: tetex  tetex-latex libstdc++ python 
-Requires: guile >= 1.6.4-7
+Buildrequires: guile-devel >= 1.6.4-8
+Requires: tetex  tetex-latex libstdc++ python  tetex-dvips tetex-latex
+Requires: guile >= 1.6.4-8
 
 %description
 LilyPond lets you create music notation.  It produces
@@ -53,7 +54,7 @@ make -C mf/ pfa
 make -C Documentation
 
 # make  html
-make web top-web 
+make web
 make -C Documentation/user omf
 
 %install
@@ -62,7 +63,6 @@ make -C Documentation/user omf
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc
 
-strip lily/out/lilypond 
 make prefix="$RPM_BUILD_ROOT%{_prefix}" infodir="$RPM_BUILD_ROOT%{_infodir}" MAKE_PFA_FILES=1 mandir="$RPM_BUILD_ROOT%{_mandir}" install
 
 %if %{info}
@@ -80,7 +80,7 @@ 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
 
-make prefix="$RPM_BUILD_ROOT%{_prefix}" install-html-doc
+make prefix="$RPM_BUILD_ROOT%{_prefix}" webdir="$RPM_BUILD_ROOT%{_prefix}/share/doc/lilypond/" out=www web-install
 
 
 %post
@@ -126,14 +126,20 @@ scrollkeeper-update
 %{_bindir}/convert-ly
 %{_bindir}/etf2ly
 %{_bindir}/lilypond
-%{_bindir}/ly2dvi
+%{_bindir}/lilypond-bin
 %{_bindir}/midi2ly
 %{_bindir}/lilypond-book
 %{_bindir}/mup2ly
 %{_bindir}/musedata2ly
 %{_bindir}/pmx2ly
 
-
+%doc THANKS
+%doc COPYING
+%doc DEDICATION
+%doc README.txt
+%doc AUTHORS.txt
+%doc INSTALL.txt
+%doc NEWS.txt
 
 %if %{info}
 %{_infodir}/*
@@ -143,8 +149,8 @@ scrollkeeper-update
 %{_mandir}/man1/as2text.1.gz
 %{_mandir}/man1/convert-ly.1.gz
 %{_mandir}/man1/etf2ly.1.gz
+%{_mandir}/man1/lilypond-bin.1.gz
 %{_mandir}/man1/lilypond.1.gz
-%{_mandir}/man1/ly2dvi.1.gz
 %{_mandir}/man1/midi2ly.1.gz
 %{_mandir}/man1/lilypond-book.1.gz
 %{_mandir}/man1/musedata2ly.1.gz
@@ -163,7 +169,7 @@ scrollkeeper-update
 
 %defattr(-, root, root)
 
-%{docdir}/@TOPLEVEL_VERSION@
+%{docdir}
 %{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@