patch::: 1.4.0.jcn7

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

diff --git a/make/redhat.spec.in b/make/redhat.spec.in
index f61dcdb229c2b69fe971c0e03d1ebebcb3af8fd6..6eeba3c36dab5b91d875948f58feb537ada3a94f 100644 (file)
--- a/make/redhat.spec.in
+++ b/make/redhat.spec.in
@@ -6,19 +6,17 @@ Release: 1
 License: GPL
 Group: Applications/Publishing
 Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
-# music notation software for.. ?
-Summary: A program for printing sheet music.
+Summary: Create and print music notation 
 URL: http://www.cs.uu.nl/~hanwen/lilypond
-# rpm: 4.0: broken for -ta builds: rpm doesn't look in tarball for xpm
-# Icon: @package@-icon.xpm
 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
 
-# use keywords: music notation software
+
 %description
-LilyPond is a music typesetter.  It produces beautiful
-sheet music using a high level description file as input.  LilyPond is
-part of the GNU Project.
+LilyPond lets you create music notation.  It produces
+beautiful sheet music from  a high-level description file.
 
 %package documentation
 Summary: Prebuilt website containing all LilyPond documentation.
@@ -40,80 +38,68 @@ The documentation of LilyPond, both in HTML and PostScript.
 # In fact, do not take out the spaces between % and { in the above comment,
 # because RPM will gladly do a substitution anyway.
 
-./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared
+./configure --disable-checking --prefix=%{_prefix} --enable-optimise
 
 make all
 
-# urg
-# %build documentation
-# line 42: second %build
-# ok, now make sure that lilypond package will succeed,
-# even if documentation fails to build
+# make info
+make -C Documentation
 
-make -C Documentation  || true
-make web || true
+# make  html
+make web-doc top-web 
 
 %install
 
 
-
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc
 
 strip lily/out/lilypond midi2ly/out/midi2ly
 make prefix="$RPM_BUILD_ROOT%{_prefix}" install
+
 %if info=="yes"
-gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true
+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-init.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
 
-
-gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* || true
-
-
-
+gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/*
 
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d
 cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh
 cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh
 
-# urg
-#%install documentation
-#line 63: second %install
+
 # again, make sure that main package installs even if doco fails
 mkdir -p web/out
-tar -C web -xzf out/web.tar.gz || true
-
-%ifos cygwin
-# urg, this symlink doesn't come through on cygwin
-# this is the way symlinks work over there, let's fake one
-rm -f $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm
-echo '!<symlink>c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm
-%{fix_suffixes}
-%endif
+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
+
 %if info=="yes"
-/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true
+/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir 
 %endif
 
 %preun
+
 %if info=="yes"
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true
+    /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir 
 fi
 %endif
 
 
 %files
-# hairy to hook it in (possibly non-existing) emacs
-%doc lilypond-mode.el
-%doc lilypond-font-lock.el
+%defattr(-, root, root)
+%{_datadir}/emacs/site-lisp/lilypond-*
+%{_datadir}/emacs/site-lisp/site-start.d/lilypond-*
 
-%ifnos cygwin
 %{_prefix}/bin/abc2ly
 %{_prefix}/bin/as2text
 %{_prefix}/bin/convert-ly
@@ -125,9 +111,6 @@ fi
 %{_prefix}/bin/mup2ly
 %{_prefix}/bin/musedata2ly
 %{_prefix}/bin/pmx2ly
-%else
-%{_prefix}/bin
-%endif
 
 %if info=="yes"
 %{_prefix}/info/lilypond.info.gz
@@ -148,11 +131,7 @@ fi
 
 %{_prefix}/share/lilypond/
 %{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo
-# urg?
 %{_prefix}/../etc/profile.d/lilypond.*
 
 %files documentation
-# this gets too messy...
-# %doc input/*.ly
-# verbatim include of input: list the directory without issuing a %dir 
 %doc web/