release commit

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

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index e06ac2b59d88c63b7bc5cebadca756adc63d2dc9..4518216fb7680061cb185ce6ae541f48e30d7f98 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -12,9 +12,8 @@ Summary: Create and print music notation
 URL: http://www.lilypond.org/
 BuildRoot: /tmp/lilypond-install
 
-# add lots of Buildreq: flex, bison, tetex, tetex-devel, tetex-latex, texinfo
-# better prereqs: tetex-latex, python, (mpost?) etc.
-Prereq: tetex t1utils bison flex pktrace texinfo tetex-latex gcc-c++ python 
+Buildrequires: t1utils bison flex mftrace texinfo
+Requires: tetex  tetex-latex libstdc++ python 
 
 %description
 LilyPond lets you create music notation.  It produces
@@ -64,7 +63,7 @@ gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/*
 %endif
 
 mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
-install -m 644 lilypond-mode.el lilypond-font-lock.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
+install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
 install -m 644 lilypond-init.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
 
 gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/*
@@ -82,14 +81,15 @@ tar -C web -xzf out/web.tar.gz
 %post
 
 touch /tmp/.lilypond-install
-rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install
+rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm' -print` /tmp/.lilypond-install
 
 %if info=="yes"
 /sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir 
 %endif
 
 
-chkfontpath --add=/usr/share/lilypond/pfa/
+/usr/X11R6/bin/mkfontdir  /usr/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
+chkfontpath --add=/usr/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 echo 'Please logout first before using LilyPond.'
 
@@ -101,7 +101,8 @@ if [ $1 = 0 ]; then
 fi
 %endif
 
-chkfontpath --remove=/usr/share/lilypond/pfa/
+rm -f /usr/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/fonts.dir
+chkfontpath --remove=/usr/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 %files
 %defattr(-, root, root)
@@ -137,11 +138,12 @@ chkfontpath --remove=/usr/share/lilypond/pfa/
 %{_prefix}/man/man1/mup2ly.1.gz
 %{_prefix}/man/man1/pmx2ly.1.gz
 
-%{_prefix}/share/lilypond/
+%{_prefix}/share/lilypond/@TOPLEVEL_VERSION@/
 %{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo
 %{_prefix}/../etc/profile.d/lilypond.*
 
 %files documentation
+
 %doc web/
 %doc input/
-%doc mutopia/ 
+