- moved font files to texmf hierarchy - now TeX utils can find them

- removed unneeded %%{_datadir}/{make,stepmake,python} from %%files - not
  needed and caused compilation problems when lilypond was installed

Changed files:
    lilypond.spec -> 1.6

diff --git a/lilypond.spec b/lilypond.spec
index ba193703fa99c08aca806ec52c1118bee364da5b..1b5e171a1d164b90c15379112f47b3d494f406e2 100644 (file)
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -18,6 +18,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _datadir        %{_prefix}/share/lilypond
 %define                _localedir      %{_prefix}/share/locale
+%define                texfontsdir     /usr/share/texmf/fonts
 
 %description
 LilyPond is a music typesetter. It produces beautiful sheet music
@@ -43,6 +44,7 @@ wszystkim oprogramowania do publikacji muzycznych.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{texfontsdir}/{afm,source,tfm}
 
 %{__make} install \
        datadir=$RPM_BUILD_ROOT%{_datadir} \
@@ -51,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
        localedir=$RPM_BUILD_ROOT%{_localedir} \
        infodir=$RPM_BUILD_ROOT%{_infodir}
 
+mv -f $RPM_BUILD_ROOT%{_datadir}/afm $RPM_BUILD_ROOT%{texfontsdir}/afm/lilypond
+mv -f $RPM_BUILD_ROOT%{_datadir}/mf $RPM_BUILD_ROOT%{texfontsdir}/source/lilypond
+mv -f $RPM_BUILD_ROOT%{_datadir}/tfm $RPM_BUILD_ROOT%{texfontsdir}/tfm/lilypond
+
 %find_lang %{name}
 
 %clean
@@ -58,14 +64,21 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %post
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
+[ ! -x /usr/bin/texhash ] || /usr/bin/texhash 1>&2
 
 %postun
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
+[ ! -x /usr/bin/texhash ] || /usr/bin/texhash 1>&2
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS.txt CHANGES DEDICATION FAQ.txt NEWS README.txt
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}
+%dir %{_datadir}
+%{_datadir}/ly
+%{_datadir}/ps
+%{_datadir}/scm
+%{_datadir}/tex
+%{texfontsdir}/*/lilypond
 %{_infodir}/*
 %{_mandir}/man1/*