- autotrace is used/required only through mftrace, so removed BR from here

- g++ 3.x is required now (acc. to configure)
- restored and updated info patch
- added sh patch to allow using lilypond script with ksh as system shell

Changed files:
    lilypond-info.patch -> 1.4
    lilypond-sh.patch -> 1.1
    lilypond.spec -> 1.19

diff --git a/lilypond-info.patch b/lilypond-info.patch
index 147520244cfac9ba7bcc3b38dc73bae5dd2990b4..9f1eb488a0bae53ad29a44bc534617601b2392dc 100644 (file)
--- a/lilypond-info.patch
+++ b/lilypond-info.patch
@@ -1,80 +1,24 @@
---- lilypond-1.6.11/Documentation/user/lilypond.tely.orig      2002-09-28 19:34:20.000000000 +0200
-+++ lilypond-1.6.11/Documentation/user/lilypond.tely   2003-08-24 16:09:34.196923912 +0200
-@@ -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.
--* ly2dvi: (lilypond)Invoking ly2dvi::          Titling LilyPond scores.
--* Glossary: (music-glossary).                  Glossary of music terms.
--* 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
-+* 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
+diff -Nur lilypond-2.0.0.orig/Documentation/user/converters.itely lilypond-2.0.0/Documentation/user/converters.itely
+--- lilypond-2.0.0.orig/Documentation/user/converters.itely    2003-09-14 02:22:35.000000000 +0200
++++ lilypond-2.0.0/Documentation/user/converters.itely 2003-10-04 01:01:25.922298656 +0200
+@@ -12,17 +12,17 @@
  
  
-@@ -92,7 +90,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 @@
-    "\\input texinfo @c -*-texinfo-*-"
-    "\n@setfilename " file-name ".info"
-    "\n@settitle " name
--   "\n@dircategory GNU music project"
-+   "\n@dircategory Miscellaneous:"
-    "\n@direntry"
-    ;; prepend GNU for dir, must be unique
--   "\n* GNU " name ": (" file-name ").          " name "."
-+   "\n* GNU " name ": (" file-name ").  " name
-    "\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. 
+-* 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
  
  
@@ -83,16 +27,16 @@
  @section Invoking convert-ly
  
  Convert-ly sequentially applies different conversions to upgrade a
-@@ -61,7 +61,7 @@
+@@ -67,7 +67,7 @@
  
- Not all language changes are handled. Only one output options can be specified.
+ Not all language changes are handled. Only one output option can be specified.
  
 -@node Invoking midi2ly
 +@node midi2ly
  @section Invoking midi2ly
  
  @cindex MIDI
-@@ -124,7 +124,7 @@
+@@ -131,7 +131,7 @@
  @end table
  
  
@@ -101,8 +45,8 @@
  @section Invoking etf2ly
  
  @cindex ETF
-@@ -158,7 +158,7 @@
- etf2ly.
+@@ -165,7 +165,7 @@
+ etf2ly. Sequences of grace notes are ended improperly sometimes. 
  
  
 -@node Invoking abc2ly
@@ -110,7 +54,7 @@
  @section Invoking abc2ly
  
  @cindex ABC
-@@ -216,7 +216,7 @@
+@@ -223,7 +223,7 @@
  
  abc2ly ignores the ABC beaming.
  
@@ -119,8 +63,8 @@
  @section Invoking pmx2ly
  
  PMX is a MusiXTeX preprocessor written by Don Simons. More information
-@@ -249,7 +249,7 @@
- @end table
+@@ -261,7 +261,7 @@
+ distribution. pmx2ly cannot parse more recent PMX files.
  
  
 -@node Invoking musedata2ly
@@ -128,44 +72,58 @@
  @section Invoking musedata2ly
  
  @cindex Musedata
-@@ -284,7 +284,7 @@
+@@ -296,7 +296,7 @@
  
- musedata2ly converts only a small subset musedata. 
+ @file{musedata2ly} converts only a small subset of 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 @@
+diff -Nur lilypond-2.0.0.orig/Documentation/user/introduction.itely lilypond-2.0.0/Documentation/user/introduction.itely
+--- lilypond-2.0.0.orig/Documentation/user/introduction.itely  2003-09-16 15:41:57.000000000 +0200
++++ lilypond-2.0.0/Documentation/user/introduction.itely       2003-10-04 01:03:38.734108192 +0200
+@@ -604,7 +604,7 @@
+ @ifhtml
+ The chapter
+ @end ifhtml
+-@emph{@ref{Invoking LilyPond}}  explains how to run LilyPond and its helper
++@emph{@ref{LilyPond}}  explains how to run LilyPond and its helper
+ programs.
+ 
+ @item
+diff -Nur lilypond-2.0.0.orig/Documentation/user/invoking.itexi lilypond-2.0.0/Documentation/user/invoking.itexi
+--- lilypond-2.0.0.orig/Documentation/user/invoking.itexi      2003-09-18 01:16:20.000000000 +0200
++++ lilypond-2.0.0/Documentation/user/invoking.itexi   2003-10-04 01:03:21.434738096 +0200
+@@ -1,19 +1,19 @@
  @c -*-texinfo-*-
 -@node Invoking LilyPond
 +@node LilyPond
  @chapter Invoking LilyPond
  
+ This chapter details the technicalities of running LilyPond.
+ 
+  
  @menu
+-* Invoking lilypond::           Titling LilyPond scores.
++* lilypond::                    Titling LilyPond scores.
+ * Invoking the lilypond binary::  
+ * Error messages::              
  * Reporting bugs::              
- * Website::                     
--* Invoking ly2dvi::           Titling LilyPond scores.
-+* ly2dvi::                    Titling LilyPond scores.
+ * Point and click::             
  @end menu
  
- @cindex Invoking LilyPond
-@@ -230,7 +230,7 @@
- website at @uref{http://www.lilypond.org/}.
- 
- 
--@node Invoking ly2dvi
-+@node ly2dvi
- @section Invoking ly2dvi
+-@node Invoking lilypond
++@node lilypond
+ @section Invoking lilypond
  
  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::  
+diff -Nur lilypond-2.0.0.orig/Documentation/user/lilypond-book.itely lilypond-2.0.0/Documentation/user/lilypond-book.itely
+--- lilypond-2.0.0.orig/Documentation/user/lilypond-book.itely 2003-09-23 22:26:16.000000000 +0200
++++ lilypond-2.0.0/Documentation/user/lilypond-book.itely      2003-10-04 01:03:55.427570400 +0200
+@@ -40,7 +40,7 @@
+ * Integrating LaTeX and music::  
  * Integrating HTML and music::  
  * Music fragment options::      
 -* Invoking lilypond-book::      
@@ -173,34 +131,122 @@
  @end menu
  
  
-@@ -282,7 +282,7 @@
-     starting note.
+@@ -219,7 +219,7 @@
+   <ly2dvifile>trip.ly</ly2dvifile>
+ @end example
+ This runs @file{trip.ly} through @code{lilypond} (see also
+-@ref{Invoking lilypond}), and substitutes a preview image in the
++@ref{lilypond}), and substitutes a preview image in the
+ output. The image links to a separate HTML file, so clicking it will
+ take the viewer to a menu, with links to images, midi and printouts.
+ 
+@@ -356,7 +356,7 @@
  @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}.
- 
+ Running @command{lilypond-book} generates lots of small files that
+@@ -469,7 +469,7 @@
+ The size of a music block is limited to 1.5 kb, due to technical
+ problems with the Python regular expression engine. For longer files,
+ use @code{\lilypondfile}.  Using @code{\lilypondfile} also makes
+-upgrading files (through convert-ly, see @ref{Invoking convert-ly})
++upgrading files (through convert-ly, see @ref{convert-ly})
+ easier.
+ 
+ @command{lilypond-book} processes all music fragments in one big run.
+diff -Nur lilypond-2.0.0.orig/Documentation/user/lilypond.tely lilypond-2.0.0/Documentation/user/lilypond.tely
+--- lilypond-2.0.0.orig/Documentation/user/lilypond.tely       2003-09-16 12:49:45.000000000 +0200
++++ lilypond-2.0.0/Documentation/user/lilypond.tely    2003-10-04 00:58:44.318866112 +0200
+@@ -13,20 +13,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.
+-* lilypond: (lilypond)Invoking lilypond::      Titling LilyPond scores.
+-* Glossary: (music-glossary).                  Glossary of music terms.
+-* 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
++* lilypond: (lilypond)lilypond.       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
  
- @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.
  
+@@ -150,7 +148,7 @@
+                                    produce it.
+ * Literature list::                Books about notation and engraving.
+ * Technical manual::               How it all works.
+-* Invoking LilyPond::              Operation.
++* LilyPond::                       Operation.
+ * Converting from other formats::  Converting to lilypond source format.
+ * lilypond-book manual::           Integrating text and music with lilypond-book.
+ * Index::                          Unified index.
+diff -Nur lilypond-2.0.0.orig/Documentation/user/refman.itely lilypond-2.0.0/Documentation/user/refman.itely
+--- lilypond-2.0.0.orig/Documentation/user/refman.itely        2003-09-24 14:38:38.000000000 +0200
++++ lilypond-2.0.0/Documentation/user/refman.itely     2003-10-04 01:04:01.543640616 +0200
+@@ -8440,7 +8440,7 @@
+ 
+ @seealso
+ 
+-@ref{Invoking lilypond},
++@ref{lilypond},
+ @inputfileref{input/regression,between-systems.ly}, and
+ @internalsref{NonMusicalPaperColumn}.
+ 
+diff -Nur lilypond-2.0.0.orig/Documentation/user/tutorial.itely lilypond-2.0.0/Documentation/user/tutorial.itely
+--- lilypond-2.0.0.orig/Documentation/user/tutorial.itely      2003-09-18 16:09:05.000000000 +0200
++++ lilypond-2.0.0/Documentation/user/tutorial.itely   2003-10-04 01:04:09.580418840 +0200
+@@ -363,7 +363,7 @@
+ @end itemize
+ 
+ The commands for formatting and printing music on all platforms are
+-detailed in @ref{Invoking LilyPond}.
++detailed in @ref{LilyPond}.
+ 
+ @node More about pitches 
+ @section More about pitches 
+@@ -1308,7 +1308,7 @@
+   @}
+ @end example
+ 
+-More information on titling can be found in @ref{Invoking lilypond}.
++More information on titling can be found in @ref{lilypond}.
+ 
+ 
+ @node Single staff polyphony
+diff -Nur lilypond-2.0.0.orig/scm/documentation-lib.scm lilypond-2.0.0/scm/documentation-lib.scm
+--- lilypond-2.0.0.orig/scm/documentation-lib.scm      2003-07-28 14:12:28.000000000 +0200
++++ lilypond-2.0.0/scm/documentation-lib.scm   2003-10-04 00:59:36.778890976 +0200
+@@ -139,10 +139,10 @@
+    "\\input texinfo @c -*-texinfo-*-"
+    "\n@setfilename " file-name ".info"
+    "\n@settitle " name
+-   "\n@dircategory GNU music project"
++   "\n@dircategory Miscellaneous:"
+    "\n@direntry"
+    ;; prepend GNU for dir, must be unique
+-   "\n* GNU " name ": (" file-name ").          " name "."
++   "\n* GNU " name ": (" file-name ").  " name
+    "\n@end direntry"
+    ))
  

diff --git a/lilypond-sh.patch b/lilypond-sh.patch
new file mode 100644 (file)
index 0000000..68c47cd
--- /dev/null
+++ b/lilypond-sh.patch
@@ -0,0 +1,31 @@
+--- lilypond-2.0.0/scripts/lilypond.py.orig    2003-09-22 19:02:56.000000000 +0200
++++ lilypond-2.0.0/scripts/lilypond.py 2003-10-04 00:52:35.055002752 +0200
+@@ -502,7 +502,7 @@
+       
+       # Ugh.  (La)TeX writes progress and error messages on stdout
+       # Redirect to stderr
+-      cmd = '(( %s  >&2 ) >&- )' % cmd
++      cmd = '( %s  >&2 )' % cmd
+       status = ly.system (cmd, ignore_error = 1)
+       signal = 0xf & status
+       exit_status = status >> 8
+--- lilypond-2.0.0/scripts/lilypond-book.py.orig       2003-09-23 20:50:42.000000000 +0200
++++ lilypond-2.0.0/scripts/lilypond-book.py    2003-10-04 00:53:30.132629680 +0200
+@@ -219,7 +219,7 @@
+               cmd = "latex '\\nonstopmode \input %s'" % fname
+               # Ugh.  (La)TeX writes progress and error messages on stdout
+               # Redirect to stderr
+-              cmd = '(( %s  >&2 ) >&- )' % cmd
++              cmd = '( %s  >&2 )' % cmd
+               status = ly.system (cmd, ignore_error = 1)
+               signal = 0xf & status
+               exit_status = status >> 8
+@@ -1403,7 +1403,7 @@
+               cmd = r"latex '\nonstopmode \input %s'" % file
+               # Ugh.  (La)TeX writes progress and error messages on stdout
+               # Redirect to stderr
+-              cmd = '(( %s  >&2 ) >&- )' % cmd
++              cmd = '( %s  >&2 )' % cmd
+               
+               ly.system (cmd)
+               ly.system ("dvips -E -o %s.eps %s" % (file, file))

diff --git a/lilypond.spec b/lilypond.spec
index 62ebbef551f004fa1635f717bbb2b33bdd2c80a1..28fd01470be5fbb30afb5612d7b1b918458a790d 100644 (file)
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -7,24 +7,23 @@ License:      GPL
 Group:         Applications/Sound
 Source0:       ftp://ftp.lilypond.org/pub/LilyPond/v2.0/%{name}-%{version}.tar.gz
 # Source0-md5: 80faf9f9abc4ecf72a71ba0036cdfee0
+Patch0:                %{name}-info.patch
+Patch1:                %{name}-sh.patch
 URL:           http://www.lilypond.org/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: bison
+BuildRequires: bison >= 1.25
 BuildRequires: flex
 BuildRequires: gettext-devel
-BuildRequires: guile-devel
+BuildRequires: guile-devel >= 1.6
 BuildRequires: kpathsea-devel
-BuildRequires: mftrace
-BuildRequires: autotrace >= 0.30
 BuildRequires: libltdl-devel
-BuildRequires: libstdc++-devel
-BuildRequires: python-devel
-BuildRequires: texinfo
+BuildRequires: libstdc++-devel >= 5:3.0
+BuildRequires: mftrace >= 1.0.17
+BuildRequires: python-devel >= 2.1
 BuildRequires: tetex-dvips
 BuildRequires: tetex-fonts-cm
 BuildRequires: tetex-fonts-cmextra
 BuildRequires: tetex-fonts-jknappen
+BuildRequires: texinfo >= 4.6
 BuildConflicts:        lilypond < 1.6.0
 Requires:      tetex-format-latex
 Requires:      ghostscript
@@ -49,21 +48,15 @@ wszystkim oprogramowania do publikacji muzycznych.
 
 %prep
 %setup -q
-
-cp -f stepmake/aclocal.m4 .
-cp -f /usr/share/automake/{config.*,install-sh} .
+%patch0 -p1
+%patch1 -p1
 
 %build
-%{__autoconf}
-cd stepmake
-%{__autoconf}
-cd ..
 %configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/profile.d
 install -d $RPM_BUILD_ROOT%{texfontsdir}/{source,tfm,type1}
 
 %{__make} install \
@@ -75,7 +68,7 @@ install -d $RPM_BUILD_ROOT%{texfontsdir}/{source,tfm,type1}
        infodir=$RPM_BUILD_ROOT%{_infodir} \
        libdir=$RPM_BUILD_ROOT%{_libdir}
 
-perl -pi -e "s#$RPM_BUILD_ROOT##" $RPM_BUILD_ROOT%{_bindir}/*
+%{__perl} -pi -e "s#$RPM_BUILD_ROOT##" $RPM_BUILD_ROOT%{_bindir}/*
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/source \
       $RPM_BUILD_ROOT%{texfontsdir}/source/lilypond
@@ -100,32 +93,28 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS.txt ChangeLog DEDICATION NEWS.txt README.txt THANKS
-
 %attr(755,root,root) %{_bindir}/*
+%dir %{_libdir}/lilypond
+%dir %{_libdir}/lilypond/%{version}
+%dir %{_libdir}/lilypond/%{version}/python
+%attr(755,root,root) %{_libdir}/lilypond/%{version}/python/midi.so
 %dir %{_datadir}/lilypond
 %dir %{_datadir}/lilypond/%{version}
-%attr(755,root,root) /etc/profile.d/*
 %{_datadir}/lilypond/%{version}/ly
 %{_datadir}/lilypond/%{version}/ps
 %dir %{_datadir}/lilypond/%{version}/python
 %{_datadir}/lilypond/%{version}/python/*.py
 %{_datadir}/lilypond/%{version}/python/*.pyc
-%dir %{_libdir}/lilypond/%{version}/python
-%attr(755,root,root) %{_libdir}/lilypond/%{version}/python/midi.so
+%{_datadir}/lilypond/%{version}/dvips
 %{_datadir}/lilypond/%{version}/fonts
 %{_datadir}/lilypond/%{version}/scm
 %{_datadir}/lilypond/%{version}/tex
 %{_infodir}/*.info*
 %{_mandir}/man1/*
 
-%dir %{_datadir}/lilypond/%{version}/dvips/
-%{_datadir}/lilypond/%{version}/dvips/*
-%dir %{_datadir}/lilypond/%{version}/make/
-%{_datadir}/lilypond/%{version}/make/*
+#%{_datadir}/lilypond/%{version}/make
 
 %{_datadir}/emacs/site-lisp/*
 %{texfontsdir}/*/lilypond
 
-
-%dir %{_datadir}/omf/lilypond/%{version}/
-%{_datadir}/omf/lilypond/%{version}/*
+%{_datadir}/omf/lilypond