X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond.redhat.spec.in;h=164a66ac17b383f0894fa4b068d170cab8046789;hb=26633bbfbf821a7cfdfe7a0367d1ea94a440be2e;hp=a383ac56a631a1e9cc8b2bd684c499928ac6c9a7;hpb=de658c9789658317b265eb7f3fd34a87c7a8f953;p=lilypond.git

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index a383ac56a6..164a66ac17 100644
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -8,14 +8,17 @@ 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
@@ -44,16 +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-doc top-web 
-make -C Documentation/user/ omf
-
+make web
+make -C Documentation/user omf
 
 %install
 
@@ -61,8 +62,7 @@ make -C Documentation/user/ omf
 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
+make prefix="$RPM_BUILD_ROOT%{_prefix}" infodir="$RPM_BUILD_ROOT%{_infodir}"  mandir="$RPM_BUILD_ROOT%{_mandir}" install
 
 %if %{info}
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
@@ -70,8 +70,8 @@ gzip -9fn $RPM_BUILD_ROOT%{_infodir}/*
 %endif
 
 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 755 -d  $RPM_BUILD_ROOT/etc/emacs/site-start.d
+install -m 644 elisp/lilypond-init.el  $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 
 gzip -9fn $RPM_BUILD_ROOT%{_mandir}/man1/*
 
@@ -79,9 +79,7 @@ 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}" web-doc-install
-make -C Documentation/user/  prefix="$RPM_BUILD_ROOT%{_prefix}" omf-install
-
+make prefix="$RPM_BUILD_ROOT%{_prefix}" webdir="$RPM_BUILD_ROOT%{_prefix}/share/doc/lilypond/" web-install
 
 
 %post
@@ -93,14 +91,12 @@ rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan
 /sbin/install-info %{_infodir}/lilypond.info.gz %{_infodir}/dir 
 %endif
 
-chkfontpath --add=%{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
-
-scrollkeeper-update
+# chkfontpath --add=%{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 echo 'Please logout first before using LilyPond.'
 
 %preun
-scrollkeeper-update
+
 
 %if %{info}
 if [ $1 = 0 ]; then
@@ -108,25 +104,42 @@ if [ $1 = 0 ]; then
 fi
 %endif
 
-chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
+# chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
+
+
+%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}/*
 %endif
@@ -135,8 +148,8 @@ chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 %{_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
@@ -146,15 +159,16 @@ chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 %{_datadir}/lilypond/@TOPLEVEL_VERSION@/
 %{_datadir}/locale/*/LC_MESSAGES/lilypond.mo
 
-%{docdir}/lilypond/@TOPLEVEL_VERSION@
-%{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@
+%{_libdir}/lilypond/
 
 /etc/profile.d/lilypond.*
 
 
-# % files documentation
+%files documentation
 
-# % defattr(-, root, root)
+%defattr(-, root, root)
 
+%{docdir}
+%{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@