X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond.redhat.spec.in;h=7f14e4c389e2706f7f171e5aef67b29ef745833f;hb=95d1198083240c84f01a0ad15b1b06c2d2079cd3;hp=916ccd5c4333c36dd90d1ad06c566903fe34230c;hpb=28c92c7edbb9314694c3c71b227adaf0a735fa3e;p=lilypond.git

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 916ccd5c43..7f14e4c389 100644
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -8,14 +8,17 @@ 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
-Requires: tetex  tetex-latex libstdc++ python 
+Buildrequires: t1utils bison flex mftrace ImageMagick
+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-8
 
 %description
 LilyPond lets you create music notation.  It produces
@@ -47,11 +50,14 @@ Documentation and example files of LilyPond. An index is available at
 make MAKE_PFA_FILES=1 all
 make -C mf/ pfa
 
+make lilypond.words
+
 # make info
 make -C Documentation
 
 # make  html
-make web-doc top-web 
+make web
+make -C Documentation/user omf
 
 %install
 
@@ -59,7 +65,6 @@ make web-doc top-web
 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}
@@ -68,7 +73,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-mode.el lilypond-font-lock.el lilypond-indent.el out/lilypond.words.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/
+
 install -m 644 lilypond-init.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/site-start.d
 
 gzip -9fn $RPM_BUILD_ROOT%{_mandir}/man1/*
@@ -77,10 +83,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}" webdir="$RPM_BUILD_ROOT%{_prefix}/share/doc/lilypond/" out=www web-install
 
 
 %post
@@ -92,19 +95,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
 
-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
 
-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)
@@ -116,13 +129,21 @@ chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 %{_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}/*
 %endif
@@ -131,8 +152,8 @@ chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 %{_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
@@ -141,11 +162,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
+
 %defattr(-, root, root)
 
-%doc web/
+%{docdir}
+%{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@