* buildscripts/new-chords.py (help): add help text

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

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 38a680bd976614b81d1f96100f8a1259fdc42560..7f2cc2f7b6a29976d006bed9f0d684e5c72621ba 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -1,20 +1,28 @@
 # -*-rpm-spec-mode-*-
 
 %define info yes
+%define docdir %{_docdir}/lilypond/
 
 Name: lilypond
 Version: @TOPLEVEL_VERSION@
 Release: 1
 License: GPL
 Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
+Source0: ftp.lilypond.org:/pub/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
 Summary: Create and print music notation 
 URL: http://www.lilypond.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
-Buildrequires: t1utils bison flex mftrace texinfo
+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
 Requires: tetex  tetex-latex libstdc++ python 
+Requires: guile >= 1.6.4-7
 
 %description
 LilyPond lets you create music notation.  It produces
@@ -27,7 +35,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}/web/Documentation/out-www/index.html
 
 %prep
 %setup
@@ -42,13 +50,16 @@ 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 info
 make -C Documentation
 
 # make  html
-make web-doc top-web 
+make web top-web 
+make -C Documentation/user omf
 
 %install
 
@@ -74,10 +85,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
 
-
-# again, make sure that main package installs even if doco fails
-mkdir -p web/out
-tar -C web -xzf out/web.tar.gz 
+make prefix="$RPM_BUILD_ROOT%{_prefix}" install-html-doc
 
 
 %post
@@ -89,21 +97,29 @@ rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan
 /sbin/install-info %{_infodir}/lilypond.info.gz %{_infodir}/dir 
 %endif
 
-/usr/X11R6/bin/mkfontdir %{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
-chkfontpath --add=%{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
+# chkfontpath --add=%{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 echo 'Please logout first before using LilyPond.'
 
 %preun
 
+
 %if %{info}
 if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/lilypond.info.gz %{_infodir}/dir 
 fi
 %endif
 
-rm -f %{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/fonts.dir
-chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
+# chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
+
+
+%post documentation
+scrollkeeper-update
+
+%postun documentation
+scrollkeeper-update
+
+
 
 %files
 %defattr(-, root, root)
@@ -122,6 +138,8 @@ chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 %{_bindir}/musedata2ly
 %{_bindir}/pmx2ly
 
+%doc buildscripts/out/convert-new-chords
+
 %if %{info}
 %{_infodir}/*
 %endif
@@ -140,10 +158,17 @@ chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 %{_datadir}/lilypond/@TOPLEVEL_VERSION@/
 %{_datadir}/locale/*/LC_MESSAGES/lilypond.mo
+
+%{_libdir}/lilypond/
+
 /etc/profile.d/lilypond.*
 
+
 %files documentation
 
-%doc web/
+%defattr(-, root, root)
+
+%{docdir}/@TOPLEVEL_VERSION@
+%{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@