release commit

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

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 66c65cd5243f10e0f0616dcbf7dc513c9ef173ba..164a66ac17b383f0894fa4b068d170cab8046789 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -15,14 +15,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
 Buildrequires: t1utils bison flex mftrace ImageMagick
-
-#  requires texinfo >= 4.6 really, otherwise the info files fuck up.
-# however, that's still not standard on RH 9, so we'll leave it at  this
-# for now
-
-Buildrequires: texinfo
+Buildrequires: texinfo >= 4.6
+Buildrequires: guile-devel >= 1.6.4-8
 Requires: tetex  tetex-latex libstdc++ python  tetex-dvips tetex-latex
-Requires: guile >= 1.6.4-7
+Requires: guile >= 1.6.4-8
 
 %description
 LilyPond lets you create music notation.  It produces
@@ -51,8 +47,7 @@ Documentation and example files of LilyPond. An index is available at
 ./configure --disable-checking --prefix=%{_prefix} --enable-optimising
 
 
-make MAKE_PFA_FILES=1 all
-make -C mf/ pfa
+make all
 
 # make info
 make -C Documentation
@@ -67,7 +62,7 @@ make -C Documentation/user omf
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc
 
-make prefix="$RPM_BUILD_ROOT%{_prefix}" infodir="$RPM_BUILD_ROOT%{_infodir}" MAKE_PFA_FILES=1 mandir="$RPM_BUILD_ROOT%{_mandir}" install
+make prefix="$RPM_BUILD_ROOT%{_prefix}" infodir="$RPM_BUILD_ROOT%{_infodir}"  mandir="$RPM_BUILD_ROOT%{_mandir}" install
 
 %if %{info}
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
@@ -75,8 +70,8 @@ gzip -9fn $RPM_BUILD_ROOT%{_infodir}/*
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el lilypond.words $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/
-install -m 644 lilypond-init.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/site-start.d
+# install -m 755 -d  $RPM_BUILD_ROOT/etc/emacs/site-start.d
+install -m 644 elisp/lilypond-init.el  $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 
 gzip -9fn $RPM_BUILD_ROOT%{_mandir}/man1/*
 
@@ -84,7 +79,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/" web-install
 
 
 %post
@@ -123,28 +118,27 @@ scrollkeeper-update
 %files
 %defattr(-, root, root)
 %{_datadir}/emacs/site-lisp/lilypond*
-%{_datadir}/emacs/site-lisp/site-start.d/lilypond-*
+%{_datadir}/emacs/site-lisp/site-start.d/lilypond*
 
 %{_bindir}/abc2ly
 %{_bindir}/as2text
 %{_bindir}/convert-ly
 %{_bindir}/etf2ly
 %{_bindir}/lilypond
-%{_bindir}/ly2dvi
+%{_bindir}/lilypond-bin
 %{_bindir}/midi2ly
 %{_bindir}/lilypond-book
 %{_bindir}/mup2ly
 %{_bindir}/musedata2ly
 %{_bindir}/pmx2ly
 
-%doc buildscripts/out/convert-new-chords
-%doc NEWS
 %doc THANKS
 %doc COPYING
 %doc DEDICATION
 %doc README.txt
 %doc AUTHORS.txt
 %doc INSTALL.txt
+%doc NEWS.txt
 
 %if %{info}
 %{_infodir}/*
@@ -154,8 +148,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
@@ -174,7 +168,7 @@ scrollkeeper-update
 
 %defattr(-, root, root)
 
-%{docdir}/@TOPLEVEL_VERSION@
+%{docdir}
 %{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@