* make/lilypond.redhat.spec.in, make/lilypond.suse.spec.in:

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

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 50924da8e848c09f8f41023ee9832f5a3aa89e6e..93cd96b9aa4cc9f2488239e2d787ebaae9320b1a 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -47,15 +47,14 @@ Documentation and example files of LilyPond. An index is available at
 ./configure --disable-checking --prefix=%{_prefix} --enable-optimising
 
 
-make MAKE_PFA_FILES=1 all
-make -C mf/ pfa
+make all
 
 # make info
 make -C Documentation
 
 # make  html
 make web
-make -C Documentation/user omf
+make -C Documentation/user local_package_docdir=%{docdir} omf
 
 %install
 
@@ -63,24 +62,34 @@ make -C Documentation/user omf
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc
 
-make prefix="$RPM_BUILD_ROOT%{_prefix}" infodir="$RPM_BUILD_ROOT%{_infodir}" MAKE_PFA_FILES=1 mandir="$RPM_BUILD_ROOT%{_mandir}" install
-
-%if %{info}
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-gzip -9fn $RPM_BUILD_ROOT%{_infodir}/*
-%endif
+make prefix="$RPM_BUILD_ROOT%{_prefix}" \
+       infodir="$RPM_BUILD_ROOT%{_infodir}"  \
+       mandir="$RPM_BUILD_ROOT%{_mandir}" install
 
+#emacs
 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-init.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/site-start.d
+install -m 644 elisp/lilypond-init.el  $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 
+#manual pages
 gzip -9fn $RPM_BUILD_ROOT%{_mandir}/man1/*
 
+
+# profile scripts.
 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}" webdir="$RPM_BUILD_ROOT%{_prefix}/share/doc/lilypond/" out=www web-install
+# web doc
+make prefix="$RPM_BUILD_ROOT%{_prefix}" \
+  infodir="$RPM_BUILD_ROOT%{_infodir}"  \
+  webdir="$RPM_BUILD_ROOT%{_prefix}/share/doc/lilypond/" web-install
+
+# info 
+%if %{info}
+rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
+gzip -9fn `find $RPM_BUILD_ROOT%{_infodir}/ -name '*.info'`
+%endif
+
 
 
 %post
@@ -90,6 +99,7 @@ rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan
 
 %if %{info}
 /sbin/install-info %{_infodir}/lilypond.info.gz %{_infodir}/dir 
+/sbin/install-info %{_infodir}/music-glossary.info.gz %{_infodir}/dir 
 %endif
 
 # chkfontpath --add=%{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
@@ -97,16 +107,19 @@ rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan
 echo 'Please logout first before using LilyPond.'
 
 %preun
+if [ -f /usr/share/lilypond/%{version}/ls-R ]; then
+  rm -f /usr/share/lilypond/%{version}/ls-R
+fi
 
 
 %if %{info}
-if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/lilypond.info.gz %{_infodir}/dir 
-fi
+    /sbin/install-info --delete %{_infodir}/music-glossary.info.gz %{_infodir}/dir 
 %endif
 
-# chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
+# chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1n/
 
+%postun
 
 %post documentation
 scrollkeeper-update
@@ -119,10 +132,9 @@ scrollkeeper-update
 %files
 %defattr(-, root, root)
 %{_datadir}/emacs/site-lisp/lilypond*
-%{_datadir}/emacs/site-lisp/site-start.d/lilypond-*
+%{_datadir}/emacs/site-lisp/site-start.d/lilypond*
 
 %{_bindir}/abc2ly
-%{_bindir}/as2text
 %{_bindir}/convert-ly
 %{_bindir}/etf2ly
 %{_bindir}/lilypond
@@ -131,7 +143,6 @@ scrollkeeper-update
 %{_bindir}/lilypond-book
 %{_bindir}/mup2ly
 %{_bindir}/musedata2ly
-%{_bindir}/pmx2ly
 
 %doc THANKS
 %doc COPYING
@@ -142,11 +153,10 @@ scrollkeeper-update
 %doc NEWS.txt
 
 %if %{info}
-%{_infodir}/*
+%{_infodir}/lilypond/
 %endif
 
 %{_mandir}/man1/abc2ly.1.gz
-%{_mandir}/man1/as2text.1.gz
 %{_mandir}/man1/convert-ly.1.gz
 %{_mandir}/man1/etf2ly.1.gz
 %{_mandir}/man1/lilypond-bin.1.gz
@@ -155,7 +165,6 @@ scrollkeeper-update
 %{_mandir}/man1/lilypond-book.1.gz
 %{_mandir}/man1/musedata2ly.1.gz
 %{_mandir}/man1/mup2ly.1.gz
-%{_mandir}/man1/pmx2ly.1.gz
 
 %{_datadir}/lilypond/@TOPLEVEL_VERSION@/
 %{_datadir}/locale/*/LC_MESSAGES/lilypond.mo