X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond.redhat.spec.in;h=93cd96b9aa4cc9f2488239e2d787ebaae9320b1a;hb=851252089ef752254c4ff464aa39aefce252bf3a;hp=77b16b94c765df3c0e8e020d5274faceaedc84d4;hpb=5076750d784d8fc19a6462915ad76ae155b8ab39;p=lilypond.git

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 77b16b94c7..93cd96b9aa 100644
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -1,20 +1,24 @@
 # -*-rpm-spec-mode-*-
 
 %define info yes
+%define docdir %{_docdir}/lilypond/
 
 Name: lilypond
 Version: @TOPLEVEL_VERSION@
 Release: 1
 License: GPL
 Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
+Source0: ftp.lilypond.org:/pub/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
 Summary: Create and print music notation 
 URL: http://www.lilypond.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
-Buildrequires: t1utils bison flex mftrace texinfo
-Requires: tetex  tetex-latex libstdc++ python 
+Buildrequires: t1utils bison flex mftrace ImageMagick
+Buildrequires: texinfo >= 4.6
+Buildrequires: guile-devel >= 1.6.4-8
+Requires: tetex  tetex-latex libstdc++ python  tetex-dvips tetex-latex
+Requires: guile >= 1.6.4-8
 
 %description
 LilyPond lets you create music notation.  It produces
@@ -27,7 +31,7 @@ Group: Applications/Publishing
 
 %description documentation
 Documentation and example files of LilyPond. An index is available at
-%{_docdir}/web/Documentation/out-www/index.html
+%{docdir}/web/Documentation/out-www/index.html
 
 %prep
 %setup
@@ -42,14 +46,15 @@ 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-doc top-web 
+make web
+make -C Documentation/user local_package_docdir=%{docdir} omf
 
 %install
 
@@ -57,28 +62,34 @@ make web-doc top-web
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc
 
-strip lily/out/lilypond 
-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
 
+# 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
 
-# again, make sure that main package installs even if doco fails
-mkdir -p web/out
-tar -C web -xzf out/web.tar.gz 
 
 
 %post
@@ -88,62 +99,86 @@ 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/
+# chkfontpath --add=%{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 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
+
+%postun documentation
+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
-%{_bindir}/ly2dvi
+%{_bindir}/lilypond-bin
 %{_bindir}/midi2ly
 %{_bindir}/lilypond-book
 %{_bindir}/mup2ly
 %{_bindir}/musedata2ly
-%{_bindir}/pmx2ly
+
+%doc THANKS
+%doc COPYING
+%doc DEDICATION
+%doc README.txt
+%doc AUTHORS.txt
+%doc INSTALL.txt
+%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
 %{_mandir}/man1/lilypond.1.gz
-%{_mandir}/man1/ly2dvi.1.gz
 %{_mandir}/man1/midi2ly.1.gz
 %{_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
+
+%{_libdir}/lilypond/
+
 /etc/profile.d/lilypond.*
 
+
 %files documentation
+
 %defattr(-, root, root)
 
-%doc web/
+%{docdir}
+%{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@