Repairs info. Commented menu. Correct directories.

diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in
index e09d22468ad7af0c4c7eac26a08de048e4d57b19..fa6992731c80f72e4c87085add43f158fc6caef1 100644 (file)
--- a/make/lilypond.mandrake.spec.in
+++ b/make/lilypond.mandrake.spec.in
@@ -25,22 +25,17 @@ high level description file as input.  Lilypond is part of the GNU project.
  
 LilyPond is split into two packages.  The package "lilypond" provides the
 core package, containing the utilities for converting the music source
-(.ly) files into printable output.  The package "lilypond-extras" provides
-the full documentation, example .ly files for various features and the
-Mutopia project files (musical equivalent of the Gutenberg project - see
+(.ly) files into printable output.  The package "lilypond-documentation" 
+provides the full documentation, example .ly files for various features and 
+the Mutopia project files (musical equivalent of the Gutenberg project - see
 http://www.mutopiaproject.org for details).
  
 If you are new to lilypond, you will almost certainly want to install the
-"lilypond-extras" package in addition to the "lilypond" package.
+"lilypond-documentation" package in addition to the "lilypond" package.
  
-## You may also wish to investigate the "denemo" package, which provides a
-## graphical front end to lilypond.
-## 
-## See the file README.first for more information.
-
 %package documentation
 Summary: LilyPond documentation, examples and Mutopia files.
-Group: Publishing
+Group: Applications/Publishing
 Requires: lilypond
 
 %description documentation
@@ -76,22 +71,18 @@ rm -rf $RPM_DOC_ROOT
 mkdir -p $RPM_DOC_ROOT
 
 strip lily/out/lilypond 
-make prefix="$RPM_BUILD_ROOT%{_prefix}" MAKE_PFA_FILES=1 all install
-# %{find_lang} %{name}
+make prefix="$RPM_BUILD_ROOT%{_prefix}" infodir="$RPM_BUILD_ROOT%{_infodir}" MAKE_PFA_FILES=1 mandir="$RPM_BUILD_ROOT%{_mandir}" install
 
-%if info=="yes"
-gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/*
+%if %{info}
+  rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
+  bzip2 $RPM_BUILD_ROOT%{_infodir}/*
 %endif
 
-# Move info and man files into correct locations
-# mv $RPM_BUILD_ROOT/usr/info $RPM_BUILD_ROOT%{_infodir}
-# mv $RPM_BUILD_ROOT/usr/man $RPM_BUILD_ROOT%{_mandir}
-
-mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
-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
+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 $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
+install -m 644 lilypond-init.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 
-gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/*
+bzip2 $RPM_BUILD_ROOT%{_mandir}/man1/*
 
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d
 cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh
@@ -102,115 +93,85 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/li
 mkdir -p web/out
 tar -C web -xzf out/web.tar.gz 
 
-# Create documentation tree in %{_docdir}
-## mkdir -p $RPM_DOC_ROOT/HTML
-## tar -C $RPM_DOC_ROOT/HTML -xzf out/web.tar.gz
-## ln -s HTML/input $RPM_DOC_ROOT/Examples
-## ln -s HTML/input/test $RPM_DOC_ROOT/Tricks
-
-## mkdir -p $RPM_DOC_ROOT/Printable
-## ln -s ../HTML/Documentation/user/out-www/lilypond.ps.gz $RPM_DOC_ROOT/Printable/Manual.ps.gz
-## ln -s ../HTML/Documentation/user/out-www/glossary.ps.gz $RPM_DOC_ROOT/Printable/Glossary.ps.gz
-## cp AUTHORS.txt COPYING DEDICATION NEWS README.txt VERSION $RPM_DOC_ROOT/README.first
-
 # Menu
 # Every entry must be changed according package specifications
 # Pay attention to "section" "command" and "longtitle"
 
-mkdir -p $RPM_BUILD_ROOT%{_menudir}
-cat >$RPM_BUILD_ROOT%{_menudir}/%{name} <<EOF
-?package(%name): command="%{_bindir}/%{name}" needs="X11" \
-icon="%{name}.png" section="Publishing" \
-title="%{name}" longtitle="%{name}"
-EOF
+# mkdir -p $RPM_BUILD_ROOT%{_menudir}
+# cat >$RPM_BUILD_ROOT%{_menudir}/%{name} <<EOF
+# ?package(%name): command="%{_bindir}/%{name}" needs="X11" \
+# icon="%{name}.png" section="Applications/Publishing" \
+# title="%{name}" longtitle="%{name}"
+# EOF
   
 # icon
-install -d $RPM_BUILD_ROOT/%{_miconsdir}
-install -d $RPM_BUILD_ROOT/%{_iconsdir}
-install -d $RPM_BUILD_ROOT/%{_liconsdir}
-bzcat %{SOURCE1} > $RPM_BUILD_ROOT/%{_miconsdir}/%{name}.png
-bzcat %{SOURCE2} > $RPM_BUILD_ROOT/%{_iconsdir}/%{name}.png
-bzcat %{SOURCE3} > $RPM_BUILD_ROOT/%{_liconsdir}/%{name}png
+# install -d $RPM_BUILD_ROOT/%{_miconsdir}
+# install -d $RPM_BUILD_ROOT/%{_iconsdir}
+# install -d $RPM_BUILD_ROOT/%{_liconsdir}
+# bzcat %{SOURCE1} > $RPM_BUILD_ROOT/%{_miconsdir}/%{name}.png
+# bzcat %{SOURCE2} > $RPM_BUILD_ROOT/%{_iconsdir}/%{name}.png
+# bzcat %{SOURCE3} > $RPM_BUILD_ROOT/%{_liconsdir}/%{name}.png
 
 %post
-%{update_menus}
+# %{update_menus}
 
 touch /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 
+%if %{info}
+  /sbin/install-info %{_infodir}/lilypond.info.bz2 %{_infodir}/dir 
 %endif
 
+/usr/X11R6/bin/mkfontdir %{_datadir}/lilypond/%{version}/fonts/type1/
+chkfontpath --add=%{_datadir}/lilypond/%{version}/fonts/type1/
+
 %preun
 
-%if info=="yes"
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir 
-fi
+%if %{info}
+  if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/lilypond.info.bz2 %{_infodir}/dir 
+  fi
 %endif
 
-rm -f /usr/share/lilypond/%{version}/fonts/type1/fonts.dir
-chkfontpath --remove=/usr/share/lilypond/%{version}/fonts/type1/
+rm -f %{_datadir}/lilypond/%{version}/fonts/type1/fonts.dir
+chkfontpath --remove=%{_datadir}/lilypond/%{version}/fonts/type1/
 
 %postun
-%{clean_menus}
+# %{clean_menus}
 
 %clean
-## This section is meant to clean the build directory tree, $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
-## %files -f %{name}.lang
 %files
-# The special tag %doc designates files being part of the documentation of the
-# package. The files so-called will be placed in /usr/doc/lilypond-%{version}/
-%doc COPYING README.txt INSTALL.txt DEDICATION NEWS AUTHORS.txt
-%{_datadir}/emacs/site-lisp/lilypond-*
+%defattr(-, root, root)
+%doc COPYING README.txt INSTALL.txt DEDICATION NEWS AUTHORS.txt THANKS
+
 # is the following really started during startup of emacs?
 %{_datadir}/emacs/site-lisp/site-start.d/lilypond-*
+%{_datadir}/emacs/site-lisp/lilypond-*
 
-%{_prefix}/bin/abc2ly
-%{_prefix}/bin/as2text
-%{_prefix}/bin/convert-ly
-%{_prefix}/bin/etf2ly
-%{_prefix}/bin/lilypond
-%{_prefix}/bin/ly2dvi
-%{_prefix}/bin/midi2ly
-%{_prefix}/bin/lilypond-book
-%{_prefix}/bin/mup2ly
-%{_prefix}/bin/musedata2ly
-%{_prefix}/bin/pmx2ly
-
-%if info=="yes"
-%{_prefix}/info/lilypond.info.gz
-%{_prefix}/info/lilypond-internals.info.gz
+%if %{info}
+  %{_infodir}/*
 %endif
 
-%{_prefix}/man/man1/abc2ly.1.bz2
-%{_prefix}/man/man1/as2text.1.bz2
-%{_prefix}/man/man1/convert-ly.1.bz2
-%{_prefix}/man/man1/etf2ly.1.bz2
-%{_prefix}/man/man1/lilypond.1.bz2
-%{_prefix}/man/man1/ly2dvi.1.bz2
-%{_prefix}/man/man1/midi2ly.1.bz2
-%{_prefix}/man/man1/lilypond-book.1.bz2
-%{_prefix}/man/man1/musedata2ly.1.bz2
-%{_prefix}/man/man1/mup2ly.1.bz2
-%{_prefix}/man/man1/pmx2ly.1.bz2
-
-%{_prefix}/share/%{name}/%{version}/
-%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo
+%{_datadir}/%{name}/%{version}/
+%{_datadir}/locale/*/LC_MESSAGES/lilypond.mo
 %{_prefix}/../etc/profile.d/lilypond.*
 %_bindir/*
-%_menudir/*
-%_miconsdir/*
-%_iconsdir/*
-%_liconsdir/*
+%_mandir/*
+# %_menudir/*
+# %_miconsdir/*
+# %_iconsdir/*
+# %_liconsdir/*
 
 %files documentation
 
 %doc web/
 
+%changelog
+* Fri Oct 28 2002 Heikki Johannes Junes <hjunes@cc.hut.fi> 1.7.4-1mdk
+- info, commented menu
+
 %changelog
 * Fri Aug 30 2002 Heikki Johannes Junes <hjunes@cc.hut.fi> 1.6.0-1mdk
 - Adapted from lilypond.redhat.skel and skeleton found in Mandrake's RPM-docs.