- updated to 1.6.0, updated info patch

- removed obsolete pythonhack and gcc3 patches
- unfortunately BC: lilypond < 1.6.0, but it shouldn't happen again with
  future versions - datadir is versioned now

Changed files:
    lilypond-gcc3.patch -> 1.2
    lilypond-info.patch -> 1.2
    lilypond-pythonhack.patch -> 1.2
    lilypond.spec -> 1.9

diff --git a/lilypond-gcc3.patch b/lilypond-gcc3.patch
deleted file mode 100644 (file)
index fd999fe..0000000
--- a/lilypond-gcc3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lilypond-1.4.13/flower/include/array.icc.orig      Sun Mar 11 19:10:32 2001
-+++ lilypond-1.4.13/flower/include/array.icc   Tue Oct 15 21:22:58 2002
-@@ -50,7 +50,7 @@
- 
- template<class T> INLINE void
- Array<T>::sort (int (*compare) (T const&,T const&),
--         int lower = -1, int upper = -1) 
-+         int lower /* = -1 */, int upper /* = -1 */) 
- {
-   if (lower < 0) 
-     {
---- lilypond-1.4.13/flower/include/parray.hh.orig      Sun Mar 11 19:10:32 2001
-+++ lilypond-1.4.13/flower/include/parray.hh   Tue Oct 15 21:25:48 2002
-@@ -196,7 +196,7 @@
- 
- template<class T> inline void
- Link_array<T>::sort (int (*compare) (T *const&,T *const&),
--              int lower = -1, int upper = -1) 
-+              int lower /* = -1 */, int upper /* = -1 */) 
- {
-   if (lower < 0) 
-     {

diff --git a/lilypond-info.patch b/lilypond-info.patch
index ba014984845fbc10fd4cad4ea10e5fef44516e03..29673fdaa823de0d7fd5b69b97269b6edfc60b08 100644 (file)
--- a/lilypond-info.patch
+++ b/lilypond-info.patch
@@ -1,18 +1,45 @@
---- lilypond-1.4.13/Documentation/user/lilypond.tely.orig      Fri May 11 15:29:05 2001
-+++ lilypond-1.4.13/Documentation/user/lilypond.tely   Sat Nov  2 13:07:49 2002
-@@ -3,10 +3,10 @@
- @settitle GNU LilyPond
- 
- 
+--- lilypond-1.6.0/Documentation/user/lilypond.tely.orig       Mon Aug 19 03:55:44 2002
++++ lilypond-1.6.0/Documentation/user/lilypond.tely    Wed Apr  2 00:33:09 2003
+@@ -12,20 +12,18 @@
+     ./install-info --info-dir=/usr/share/info out/lilypond.info
+     
+ @end ignore
 -@dircategory GNU music project
 +@dircategory Miscellaneous:
  @direntry
  @c    ;; prepend GNU for dir, must be unique
--* GNU LilyPond: (lilypond).          The GNU music typesetter.
+-* GNU LilyPond: (lilypond).                    The GNU music typesetter.
+-* ly2dvi: (lilypond)Invoking ly2dvi::          Titling LilyPond scores.
+-* convert-ly: (lilypond)Invoking convert-ly::
+-                                               Older LilyPond versions.
+-* midi2ly: (lilypond)Invoking midi2ly::        Importing MIDI.
+-* etf2ly: (lilypond)Invoking etf2ly::          Importing Finale.
+-* abc2ly: (lilypond)Invoking abc2ly::          Importing ABC.          
+-* pmx2ly: (lilypond)Invoking pmx2ly::          Importing PMX.
+-* musedata2ly: (lilypond)Invoking musedata2ly::
+-                                               Importing Musedata.
+-* mup2ly: (lilypond)Invoking mup2ly::          Importing MUP. 
 +* GNU LilyPond: (lilypond).           The GNU music typesetter
- @c * install-info: (texinfo)Invoking install-info. Update info/dir entries.
- @c * texi2dvi: (texinfo)Format with texi2dvi.      Print Texinfo documents.
++* ly2dvi: (lilypond)ly2dvi::          Titling LilyPond scores
++* convert-ly: (lilypond)convert-ly::  Older LilyPond versions
++* midi2ly: (lilypond)midi2ly::                Importing MIDI
++* etf2ly: (lilypond)etf2ly::          Importing Finale
++* abc2ly: (lilypond)abc2ly::          Importing ABC
++* pmx2ly: (lilypond)pmx2ly::          Importing PMX
++* musedata2ly: (lilypond)musedata2ly::        Importing Musedata
++* mup2ly: (lilypond)mup2ly::          Importing MUP
  @end direntry
+ 
+ 
+@@ -90,7 +88,7 @@
+ * Tutorial::                       A tutorial introduction to LilyPond.
+ * Reference Manual::               Reference Manual.
+ * Advanced Topics::                How it all works.
+-* Invoking LilyPond::              Operation.
++* LilyPond::                       Operation.
+ * Converting from other formats::  Converting to lilypond source format.
+ * Integrating text and music with lilypond-book::
+                                    The lilypond-book manual.
 --- lilypond-1.4.13/scm/documentation-lib.scm.orig     Fri Apr  6 18:06:46 2001
 +++ lilypond-1.4.13/scm/documentation-lib.scm  Sat Nov  2 13:13:40 2002
 @@ -108,10 +108,10 @@
@@ -28,3 +55,152 @@
     "\n@end direntry"
     ;; ugh, prev and next should be settable, of course
     (node "Top") ",(lilypond)Index,(lilypond)Full Grob interface list," top
+--- lilypond-1.6.0/Documentation/user/converters.itely.orig    Mon Aug 19 03:55:44 2002
++++ lilypond-1.6.0/Documentation/user/converters.itely Wed Apr  2 20:18:49 2003
+@@ -4,17 +4,17 @@
+ @chapter Converting from other formats
+ 
+ @menu
+-* Invoking convert-ly::            Older LilyPond versions.
+-* Invoking midi2ly::               Importing MIDI.
+-* Invoking etf2ly::                Importing Finale.
+-* Invoking abc2ly::                Importing ABC.          
+-* Invoking pmx2ly::                Importing PMX.
+-* Invoking musedata2ly::           Importing Musedata.
+-* Invoking mup2ly::                Importing MUP. 
++* convert-ly::                     Older LilyPond versions.
++* midi2ly::                        Importing MIDI.
++* etf2ly::                         Importing Finale.
++* abc2ly::                         Importing ABC.          
++* pmx2ly::                         Importing PMX.
++* musedata2ly::                    Importing Musedata.
++* mup2ly::                         Importing MUP. 
+ @end menu
+ 
+ 
+-@node Invoking convert-ly
++@node convert-ly
+ @section Invoking convert-ly
+ 
+ Convert-ly sequentially applies different conversions to upgrade a
+@@ -61,7 +61,7 @@
+ 
+ Not all language changes are handled. Only one output options can be specified.
+ 
+-@node Invoking midi2ly
++@node midi2ly
+ @section Invoking midi2ly
+ 
+ @cindex MIDI
+@@ -124,7 +124,7 @@
+ @end table
+ 
+ 
+-@node Invoking etf2ly
++@node etf2ly
+ @section Invoking etf2ly
+ 
+ @cindex ETF
+@@ -158,7 +158,7 @@
+ etf2ly.
+ 
+ 
+-@node Invoking abc2ly
++@node abc2ly
+ @section Invoking abc2ly
+ 
+ @cindex ABC
+@@ -216,7 +216,7 @@
+ 
+ abc2ly ignores the ABC beaming.
+ 
+-@node Invoking pmx2ly
++@node pmx2ly
+ @section Invoking pmx2ly
+ 
+ PMX is a MusiXTeX preprocessor written by Don Simons. More information
+@@ -249,7 +249,7 @@
+ @end table
+ 
+ 
+-@node Invoking musedata2ly
++@node musedata2ly
+ @section Invoking musedata2ly
+ 
+ @cindex Musedata
+@@ -284,7 +284,7 @@
+ 
+ musedata2ly converts only a small subset musedata. 
+ 
+-@node Invoking mup2ly
++@node mup2ly
+ @section Invoking mup2ly
+ 
+ MUP (Music Publisher) is a shareware music notation program by Arkkra
+--- lilypond-1.6.0/Documentation/user/invoking.itexi.orig      Mon Aug 19 03:55:44 2002
++++ lilypond-1.6.0/Documentation/user/invoking.itexi   Wed Apr  2 20:20:05 2003
+@@ -1,11 +1,11 @@
+ @c -*-texinfo-*-
+-@node Invoking LilyPond
++@node LilyPond
+ @chapter Invoking LilyPond
+ 
+ @menu
+ * Reporting bugs::              
+ * Website::                     
+-* Invoking ly2dvi::           Titling LilyPond scores.
++* ly2dvi::                    Titling LilyPond scores.
+ @end menu
+ 
+ @cindex Invoking LilyPond
+@@ -230,7 +230,7 @@
+ website at @uref{http://www.lilypond.org/}.
+ 
+ 
+-@node Invoking ly2dvi
++@node ly2dvi
+ @section Invoking ly2dvi
+ 
+ Nicely titled output is created through a separate program:
+--- lilypond-1.6.0/Documentation/user/lilypond-book.itely.orig Mon Aug 19 03:55:44 2002
++++ lilypond-1.6.0/Documentation/user/lilypond-book.itely      Wed Apr  2 20:20:30 2003
+@@ -34,7 +34,7 @@
+ * Integrating La@TeX{} and music::  
+ * Integrating HTML and music::  
+ * Music fragment options::      
+-* Invoking lilypond-book::      
++* lilypond-book::      
+ @end menu
+ 
+ 
+@@ -282,7 +282,7 @@
+     starting note.
+ @end table
+ 
+-@node Invoking lilypond-book
++@node lilypond-book
+ @section Invoking lilypond-book
+ 
+ When you run @command{lilypond-book} it will generate lots of small
+--- lilypond-1.6.0/Documentation/user/refman.itely.orig        Mon Aug 19 03:55:44 2002
++++ lilypond-1.6.0/Documentation/user/refman.itely     Wed Apr  2 20:20:59 2003
+@@ -522,7 +522,7 @@
+ 
+ Another option is to enter the music using your favorite MIDI
+ sequencer, and then import it using midi2ly. midi2ly is described in
+-@ref{Invoking midi2ly}.
++@ref{midi2ly}.
+ 
+ 
+ @c .  {Relative}
+--- lilypond-1.6.0/Documentation/user/tutorial.itely.orig      Wed Apr  2 20:21:27 2003
++++ lilypond-1.6.0/Documentation/user/tutorial.itely   Wed Apr  2 20:21:06 2003
+@@ -1749,7 +1749,7 @@
+ for.  When you compile this file, the version number will be checked
+ and you will get a warning when the file is too old.  This version
+ number is also used by the @code{convert-ly} program (See
+-@ref{Invoking convert-ly}), which can used to update the file to the
++@ref{convert-ly}), which can used to update the file to the
+ latest lily version.
+ 
+ 

diff --git a/lilypond-pythonhack.patch b/lilypond-pythonhack.patch
deleted file mode 100644 (file)
index f611466..0000000
--- a/lilypond-pythonhack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lilypond-1.4.13/scripts/lilypond-book.py.orig      Thu May  2 12:11:47 2002
-+++ lilypond-1.4.13/scripts/lilypond-book.py   Sun Jul 14 23:25:15 2002
-@@ -60,6 +60,8 @@
- except ImportError:
-       import re
- 
-+import sre
-+
- program_version = '@TOPLEVEL_VERSION@'
- if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
-       program_version = '1.4.12'
-@@ -485,7 +487,7 @@
- 
- def output_verbatim (body):
-       if __main__.format == 'texi':
--              body = re.sub ('([@{}])', '@\\1', body)
-+              body = sre.sub ('([@{}])', '@\\1', body)
-       return get_output ('output-verbatim') % body
- 
- 

diff --git a/lilypond.spec b/lilypond.spec
index c0391500e626bb9669c7b0c76605476e907ca33f..0ce240327a3b7223f6c3d46f371d5ae2eafe07dc 100644 (file)
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -1,14 +1,12 @@
 Summary:       Music typesetter
 Summary(pl):   Program do sk³adania nut
 Name:          lilypond
-Version:       1.4.13
-Release:       3
+Version:       1.6.0
+Release:       1
 License:       GPL
 Group:         Applications/Sound
 Source0:       ftp://ftp.gnu.org/gnu/lilypond/%{name}-%{version}.tar.gz
-Patch0:                %{name}-pythonhack.patch
-Patch1:                %{name}-gcc3.patch
-Patch2:                %{name}-info.patch
+Patch0:                %{name}-info.patch
 URL:           http://www.cs.uu.nl/people/hanwen/lilypond/index.html
 BuildRequires: bison
 BuildRequires: flex
@@ -16,10 +14,11 @@ BuildRequires:      guile-devel
 BuildRequires: kpathsea-devel
 BuildRequires: libltdl-devel
 BuildRequires: libstdc++-devel
+BuildRequires: python
 BuildRequires: texinfo
+BuildConflicts:        lilypond < 1.6.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _datadir        %{_prefix}/share/lilypond
 %define                _localedir      %{_prefix}/share/locale
 %define                texfontsdir     /usr/share/texmf/fonts
 
@@ -40,8 +39,6 @@ wszystkim oprogramowania do publikacji muzycznych.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure2_13
@@ -52,20 +49,21 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{texfontsdir}/{afm,source,tfm}
 
 %{__make} install \
+       local_lilypond_datadir=$RPM_BUILD_ROOT%{_datadir}/lilypond/%{version} \
        datadir=$RPM_BUILD_ROOT%{_datadir} \
        mandir=$RPM_BUILD_ROOT%{_mandir} \
        bindir=$RPM_BUILD_ROOT%{_bindir} \
        localedir=$RPM_BUILD_ROOT%{_localedir} \
        infodir=$RPM_BUILD_ROOT%{_infodir}
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/afm $RPM_BUILD_ROOT%{texfontsdir}/afm/lilypond
-mv -f $RPM_BUILD_ROOT%{_datadir}/mf $RPM_BUILD_ROOT%{texfontsdir}/source/lilypond
-mv -f $RPM_BUILD_ROOT%{_datadir}/tfm $RPM_BUILD_ROOT%{texfontsdir}/tfm/lilypond
+mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/afm $RPM_BUILD_ROOT%{texfontsdir}/afm/lilypond
+mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/source $RPM_BUILD_ROOT%{texfontsdir}/source/lilypond
+mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/tfm $RPM_BUILD_ROOT%{texfontsdir}/tfm/lilypond
 
 %find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 %post
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
@@ -77,13 +75,16 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS.txt CHANGES DEDICATION FAQ.txt NEWS README.txt
+%doc AUTHORS.txt CHANGES DEDICATION NEWS README.txt
 %attr(755,root,root) %{_bindir}/*
-%dir %{_datadir}
-%{_datadir}/ly
-%{_datadir}/ps
-%{_datadir}/scm
-%{_datadir}/tex
+%dir %{_datadir}/lilypond
+%dir %{_datadir}/lilypond/%{version}
+%{_datadir}/lilypond/%{version}/ly
+%{_datadir}/lilypond/%{version}/ps
+%dir %{_datadir}/lilypond/%{version}/python
+%attr(755,root,root) %{_datadir}/lilypond/%{version}/python/midi.so
+%{_datadir}/lilypond/%{version}/scm
+%{_datadir}/lilypond/%{version}/tex
 %{texfontsdir}/*/lilypond
-%{_infodir}/*
+%{_infodir}/*.info*
 %{_mandir}/man1/*