- added more POSIX sh syntax fixes to sh patch

- moved more dirs into texmf tree - now works, release 1

Changed files:
    lilypond.spec -> 1.33

diff --git a/lilypond.spec b/lilypond.spec
index 611fce3f8aeac7b9aa77cc53d8c819a4690841d3..dcc514ed95d59b219ec34eafcbab7b811dc5b691 100644 (file)
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -2,7 +2,7 @@ Summary:        Music typesetter
 Summary(pl):   Program do sk³adania nut
 Name:          lilypond
 Version:       2.4.1
-Release:       0.2
+Release:       1
 License:       GPL
 Group:         Applications/Sound
 Source0:       http://lilypond.org/download/v2.4/%{name}-%{version}.tar.gz
@@ -38,7 +38,8 @@ Requires:     tetex-format-latex >= 1.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _localedir      %{_prefix}/share/locale
-%define                texfontsdir     /usr/share/texmf/fonts
+%define                texmfdir        /usr/share/texmf
+%define                texfontsdir     %{texmfdir}/fonts
 
 %description
 LilyPond is a music typesetter. It produces beautiful sheet music
@@ -82,7 +83,7 @@ cp -f /usr/share/automake/config.* stepmake/bin
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{texfontsdir}/{source,afm,tfm,type1}
+install -d $RPM_BUILD_ROOT{%{texmfdir}/{dvips,tex},%{texfontsdir}/{afm,source,tfm,type1}}
 
 %{__make} install \
        local_lilypond_datadir=$RPM_BUILD_ROOT%{_datadir}/lilypond/%{version} \
@@ -95,6 +96,8 @@ install -d $RPM_BUILD_ROOT%{texfontsdir}/{source,afm,tfm,type1}
 
 %{__perl} -pi -e "s#$RPM_BUILD_ROOT##" $RPM_BUILD_ROOT%{_bindir}/*
 
+mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/dvips \
+      $RPM_BUILD_ROOT%{texmfdir}/dvips/lilypond
 mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/afm \
       $RPM_BUILD_ROOT%{texfontsdir}/afm/lilypond
 mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/source \
@@ -103,12 +106,15 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/tfm \
       $RPM_BUILD_ROOT%{texfontsdir}/tfm/lilypond
 mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/type1 \
       $RPM_BUILD_ROOT%{texfontsdir}/type1/lilypond
+mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/tex \
+      $RPM_BUILD_ROOT%{texmfdir}/tex/lilypond
 rmdir $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts
 
 mv -f $RPM_BUILD_ROOT%{_infodir}/lilypond/*.info* $RPM_BUILD_ROOT%{_infodir}
 
 # to avoid conflict with tth (call in lily.scm changed by -ps2png.patch)
 mv -f $RPM_BUILD_ROOT%{_bindir}/{ps2png,lilypond-ps2png}
+mv -f $RPM_BUILD_ROOT%{_mandir}/man1/{ps2png,lilypond-ps2png}.1
 
 %find_lang %{name}
 
@@ -118,10 +124,12 @@ 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
+[ ! -x /usr/bin/scrollkeeper-update ] || /usr/bin/scrollkeeper-update
 
 %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
+[ ! -x /usr/bin/scrollkeeper-update ] || /usr/bin/scrollkeeper-update
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -138,19 +146,20 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/lilypond/%{version}/python
 %{_datadir}/lilypond/%{version}/python/*.py
 %{_datadir}/lilypond/%{version}/python/*.pyc
-%{_datadir}/lilypond/%{version}/dvips
-%{_datadir}/lilypond/%{version}/fonts
 %{_datadir}/lilypond/%{version}/scm
-%{_datadir}/lilypond/%{version}/tex
 %{_infodir}/*.info*
 %{_mandir}/man1/*
 
 # lilypond/stepmake build system - not needed at runtime
 #%{_datadir}/lilypond/%{version}/make
 
-%{texfontsdir}/*/lilypond
+%{texfontsdir}/afm/lilypond
+%{texfontsdir}/source/lilypond
+%{texfontsdir}/tfm/lilypond
+%{texfontsdir}/type1/lilypond
+%{texmfdir}/dvips/lilypond
+%{texmfdir}/tex/lilypond
 
-# needed? subpackage? (could install in non-existing dir)
 %{_datadir}/omf/lilypond
 
 %files -n emacs-lilypond-mode-pkg