X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fout%2Flilypond.spec;h=31e7302fb79f7ebf6de1d17777a1c5219842d93f;hb=f7c306cacfbdf6229e9414c691e36e49b41ea71a;hp=647dfb5cc405848c68bc4a9435d09edb3d151c57;hpb=01d6763cea8e4890874001a2f756ba2162e4262f;p=lilypond.git

diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index 647dfb5cc4..31e7302fb7 100644
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,21 +1,25 @@
+%define info yes
+
 Name: lilypond
-Version: 1.3.75
+Version: 1.3.150
 Release: 1
-Copyright: GPL
+License: GPL
 Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.75.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.150.tar.gz
+# music notation software for.. ?
 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
-# Icon: lilypond-icon.gif
+# rpm: 4.0: broken for -ta builds: rpm doesn't look in tarball for xpm
+# Icon: lilypond-icon.xpm
 BuildRoot: /tmp/lilypond-install
 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.
 
-
 %package documentation
 Summary: Prebuilt website containing all LilyPond documentation.
 Group: Applications/Publishing
@@ -23,7 +27,6 @@ Group: Applications/Publishing
 
 %description documentation
 
-
 The documentation of LilyPond, both in HTML and PostScript.
 
 %prep
@@ -31,27 +34,46 @@ The documentation of LilyPond, both in HTML and PostScript.
 
 %build
 
-%{configure} --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared
+#
 
-make all
+# DO NOT use % { configure } , it hardcodes all paths, runs libtool,
+# so we can't do make prefix=/tmp/ install.
 
-ln -s %{_prefix}/share/texmf/fonts/tfm/public/cm/ tfm
+# In fact, do not take out the spaces between % and { , because RPM will gladly
+# do a substitution anyway.
+
+./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared
+
+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 -C Documentation  || true
-make htmldoc || true
+make web || true
 
 %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
-# gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true
+%if info=="yes"
+gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true
+%endif
+
+
+
+gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* || true
+
+
+
 
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d
 cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh
@@ -61,10 +83,8 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/li
 #%install documentation
 #line 63: second %install
 # again, make sure that main package installs even if doco fails
-mkdir -p htmldocs/out
-tar -C htmldocs -xzf out/htmldoc.tar.gz || true
-mkdir -p out/examples/
-tar -cf - input/  | tar -C out/examples/ -xf- || true
+mkdir -p web/out
+tar -C web -xzf out/web.tar.gz || true
 
 %ifos cygwin
 # urg, this symlink doesn't come through on cygwin
@@ -78,34 +98,56 @@ echo '!<symlink>c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/s
 
 touch /tmp/.lilypond-install
 rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install
-# /sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true
+%if info=="yes"
+/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true
+%endif
 
 %preun
+%if info=="yes"
 if [ $1 = 0 ]; then
- true #   /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 || true
 fi
+%endif
 
 
 %files
 # hairy to hook it in (possibly non-existing) emacs
-%doc mudela-mode.el
+%doc lilypond-mode.el
+%doc lilypond-font-lock.el
 
 %ifnos cygwin
 %{_prefix}/bin/abc2ly
-%{_prefix}/bin/convert-mudela
-%{_prefix}/bin/mudela-book
-%{_prefix}/bin/ly2dvi
+%{_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
 %else
 %{_prefix}/bin
 %endif
 
-%{_prefix}/man/man1/midi2ly.1
-%{_prefix}/man/man1/lilypond.1
-%{_prefix}/man/man1/mudela-book.1
-%{_prefix}/man/man1/ly2dvi.1
-%{_prefix}/man/man1/convert-mudela.1
+%if info=="yes"
+%{_prefix}/info/lilypond.info.gz
+%{_prefix}/info/lilypond-internals.info.gz
+%endif
+
+%{_prefix}/man/man1/abc2ly.1.gz
+%{_prefix}/man/man1/as2text.1.gz
+%{_prefix}/man/man1/convert-ly.1.gz
+%{_prefix}/man/man1/etf2ly.1.gz
+%{_prefix}/man/man1/lilypond.1.gz
+%{_prefix}/man/man1/ly2dvi.1.gz
+%{_prefix}/man/man1/midi2ly.1.gz
+%{_prefix}/man/man1/lilypond-book.1.gz
+%{_prefix}/man/man1/musedata2ly.1.gz
+%{_prefix}/man/man1/mup2ly.1.gz
+%{_prefix}/man/man1/pmx2ly.1.gz
+
 %{_prefix}/share/lilypond/
 %{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo
 # urg?
@@ -115,6 +157,4 @@ fi
 # this gets too messy...
 # %doc input/*.ly
 # verbatim include of input: list the directory without issuing a %dir 
-%doc htmldocs/
-%doc out/examples/
-%doc mutopia/
+%doc web/