X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond.redhat.spec.in;h=10c068a0ff74b9c037d1df8300b135af9eb1484e;hb=782edd5636ed17a18129da339406d6a7b1de27f2;hp=07176b3d8ea35e6b99feb769916886c459d87bf7;hpb=b695260174219043bddbbaf79b2affed8b8aa108;p=lilypond.git

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 07176b3d8e..10c068a0ff 100644
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -8,14 +8,21 @@ 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
@@ -51,9 +58,8 @@ make -C mf/ pfa
 make -C Documentation
 
 # make  html
-make web-doc top-web 
-make -C Documentation/user/ omf
-
+make web top-web 
+make -C Documentation/user omf
 
 %install
 
@@ -61,7 +67,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}
@@ -79,9 +84,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}" web-doc-install
-make -C Documentation/user/  prefix="$RPM_BUILD_ROOT%{_prefix}" omf-install
-
+make prefix="$RPM_BUILD_ROOT%{_prefix}" install-html-doc
 
 
 %post
@@ -93,18 +96,12 @@ 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
 
-%post documentation
-scrollkeeper-update
-
-%preun documentation
-scrollkeeper-update
-
 
 %if %{info}
 if [ $1 = 0 ]; then
@@ -112,7 +109,16 @@ if [ $1 = 0 ]; then
 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)
@@ -131,6 +137,15 @@ chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 %{_bindir}/musedata2ly
 %{_bindir}/pmx2ly
 
+%doc buildscripts/out/convert-new-chords
+%doc NEWS
+%doc THANKS
+%doc COPYING
+%doc DEDICATION
+%doc README.txt
+%doc AUTHORS.txt
+
+
 %if %{info}
 %{_infodir}/*
 %endif
@@ -150,6 +165,7 @@ 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.*
 
@@ -158,7 +174,7 @@ chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 %defattr(-, root, root)
 
-%{docdir}/lilypond/@TOPLEVEL_VERSION@
+%{docdir}/@TOPLEVEL_VERSION@
 %{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@