- updated to 1.4.13, some work - builds now

- pythonhack patch - avoid an error when creating documentation
- generally works except fonts - dvips and co. doesn't see them

Changed files:
    lilypond-pythonhack.patch -> 1.1
    lilypond.spec -> 1.5

diff --git a/lilypond-pythonhack.patch b/lilypond-pythonhack.patch
new file mode 100644 (file)
index 0000000..f611466
--- /dev/null
+++ b/lilypond-pythonhack.patch
@@ -0,0 +1,20 @@
+--- 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 2cd98661eec408900dbdfe9006be7053abc1430d..ba193703fa99c08aca806ec52c1118bee364da5b 100644 (file)
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -1,14 +1,24 @@
 Summary:       Music typesetter
 Summary(pl):   Program do sk³adania nut
 Name:          lilypond
-Version:       1.2.6
+Version:       1.4.13
 Release:       1
 License:       GPL
 Group:         Applications/Sound
 Source0:       ftp://ftp.gnu.org/gnu/lilypond/%{name}-%{version}.tar.gz
+Patch0:                %{name}-pythonhack.patch
 URL:           http://www.cs.uu.nl/people/hanwen/lilypond/index.html
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: guile-devel
+BuildRequires: kpathsea-devel
+BuildRequires: libltdl-devel
+BuildRequires: libstdc++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _datadir        %{_prefix}/share/lilypond
+%define                _localedir      %{_prefix}/share/locale
+
 %description
 LilyPond is a music typesetter. It produces beautiful sheet music
 using a high level description file as input. It excels at typesetting
@@ -25,6 +35,7 @@ wszystkim oprogramowania do publikacji muzycznych.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure2_13
@@ -33,10 +44,28 @@ wszystkim oprogramowania do publikacji muzycznych.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       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}
+
+%find_lang %{name}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files
+%post
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
+
+%postun
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
+
+%files -f %{name}.lang
 %defattr(644,root,root,755)
+%doc AUTHORS.txt CHANGES DEDICATION FAQ.txt NEWS README.txt
+%attr(755,root,root) %{_bindir}/*
+%{_datadir}
+%{_infodir}/*
+%{_mandir}/man1/*