packages: lilypond/lilypond-afm.patch, lilypond/lilypond-info.patch, lilypo...
gotar
gotar at pld-linux.org
Sun Jun 21 13:23:21 CEST 2009
Author: gotar Date: Sun Jun 21 11:23:21 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- upgraded to 2.12.2;
- updated patches (info, afm), obsoleted po, gcc43 and gcc3 (req. 3.4 not 3.3),
- updated BRs (versions, added fonts-Type1-urw, perl-base and tetex-metapost),
- note: texmfdir should be replaced somewhere with texmfdist for texlive (!),
- fixed %{texmfdir}/dvips contents, package tfm files, lilymidi and lilysong
---- Files affected:
packages/lilypond:
lilypond-afm.patch (1.2 -> 1.3) , lilypond-info.patch (1.14 -> 1.15) , lilypond.spec (1.54 -> 1.55) , lilypond-gcc3.patch (1.3 -> NONE) (REMOVED), lilypond-gcc43.patch (1.1 -> NONE) (REMOVED), lilypond-po.patch (1.4 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/lilypond/lilypond-afm.patch
diff -u packages/lilypond/lilypond-afm.patch:1.2 packages/lilypond/lilypond-afm.patch:1.3
--- packages/lilypond/lilypond-afm.patch:1.2 Mon Nov 20 23:18:00 2006
+++ packages/lilypond/lilypond-afm.patch Sun Jun 21 13:23:15 2009
@@ -1,8 +1,10 @@
--- lilypond-2.10.0/mf/GNUmakefile.orig 2006-11-10 14:44:26.000000000 +0100
+++ lilypond-2.10.0/mf/GNUmakefile 2006-11-20 20:37:29.872935500 +0100
-@@ -155,4 +155,4 @@
- $(NCSB_OTFS): $(NCSB_SOURCE_FILES) $(buildscript-dir)/pfx2ttf.fontforge
+@@ -193,6 +193,6 @@
+ $(auxscript-dir)/pfx2ttf.fontforge
$(foreach i, $(basename $(NCSB_SOURCE_FILES)), \
- $(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \
+ $(FONTFORGE) -script $(auxscript-dir)/pfx2ttf.fontforge \
- $(i).pfb $(i).afm $(outdir)/ && ) true
+ $(i).pfb $(dir $(i))afm/$(notdir $(i)).afm $(outdir)/ && ) true
+
+ # eof
================================================================
Index: packages/lilypond/lilypond-info.patch
diff -u packages/lilypond/lilypond-info.patch:1.14 packages/lilypond/lilypond-info.patch:1.15
--- packages/lilypond/lilypond-info.patch:1.14 Mon Nov 20 23:18:00 2006
+++ packages/lilypond/lilypond-info.patch Sun Jun 21 13:23:15 2009
@@ -1,18 +1,18 @@
--- lilypond-2.10.0/Documentation/user/converters.itely.orig 2006-11-10 14:44:25.000000000 +0100
+++ lilypond-2.10.0/Documentation/user/converters.itely 2006-11-20 20:07:34.356722750 +0100
-@@ -25,16 +25,16 @@
-
+@@ -31,16 +31,16 @@
+ bug reports will almost certainly not be resolved.
@menu
-* Invoking midi2ly:: Importing MIDI.
+-* Invoking musicxml2ly:: Importing MusicXML.
+-* Invoking abc2ly:: Importing ABC.
-* Invoking etf2ly:: Importing Finale.
--* Invoking musicxml2ly::
--* Invoking abc2ly:: Importing ABC.
+* midi2ly:: Importing MIDI.
++* musicxml2ly:: Importing MusicXML.
++* abc2ly:: Importing ABC.
+* etf2ly:: Importing Finale.
-+* musicxml2ly::
-+* abc2ly:: Importing ABC.
- * Generating LilyPond files::
+ * Generating LilyPond files:: GUIs, transcribers, and algorithmic composition programs.
@end menu
@@ -22,74 +22,71 @@
@section Invoking @command{midi2ly}
@cindex MIDI
-@@ -121,7 +121,7 @@
+@@ -127,7 +127,7 @@
to a single duration and add phrase markings or pedal indicators.
-- at node Invoking etf2ly
-+ at node etf2ly
- @section Invoking @command{etf2ly}
-
- @cindex ETF
-@@ -160,7 +160,7 @@
- The list of articulation scripts is incomplete. Empty measures
- confuse @command{etf2ly}. Sequences of grace notes are ended improperly.
-
- at node Invoking musicxml2ly
+ at node musicxml2ly
@section Invoking @code{musicxml2ly}
- @uref{http://@/www.@/recordarde@/.com/xml@/.html,MusicXML} is an XML dialect
-@@ -184,7 +184,7 @@
- print version information.
+ @cindex MusicXML
+@@ -195,7 +195,7 @@
@end table
+
- at node Invoking abc2ly
+ at node abc2ly
@section Invoking @code{abc2ly}
@cindex ABC
+@@ -260,7 +260,7 @@
+ @command{abc2ly} ignores the ABC beaming.
+
+
+- at node Invoking etf2ly
++ at node etf2ly
+ @section Invoking @command{etf2ly}
+
+ @cindex ETF
--- lilypond-2.10.0/Documentation/user/running.itely.orig 2006-11-10 14:44:25.000000000 +0100
+++ lilypond-2.10.0/Documentation/user/running.itely 2006-11-20 20:08:46.477230000 +0100
-@@ -20,7 +20,7 @@
- you are unfamiliar with the command-line.
+@@ -50,12 +50,12 @@
+ if you are unfamiliar with the command-line.
@menu
--* Invoking lilypond::
-+* lilypond::
- * Notes for the MacOS X app::
- * Updating files with convert-ly::
- * Reporting bugs::
-@@ -29,7 +29,7 @@
- * Point and click::
+-* Invoking lilypond::
++* lilypond::
+ * Command line options for lilypond::
+ * Environment variables::
@end menu
- at node Invoking lilypond
+ at node lilypond
- @section Invoking lilypond
- @cindex Invoking LilyPond
- @cindex command line options
+ @subsection Invoking @command{lilypond}
+
+ @cindex Invoking @command{lilypond}
--- lilypond-2.10.0/Documentation/user/lilypond-book.itely.orig 2006-11-10 14:44:25.000000000 +0100
+++ lilypond-2.10.0/Documentation/user/lilypond-book.itely 2006-11-20 20:09:06.130458250 +0100
-@@ -37,7 +37,7 @@
- * Integrating HTML and music::
- * Integrating DocBook and music::
- * Music fragment options::
--* Invoking lilypond-book::
-+* lilypond-book::
- * Filename extensions::
- * Many quotes of a large score::
- * Inserting LilyPond output into other programs::
-@@ -299,7 +299,7 @@
-
- @noindent
- where the @var{file}@command{psfonts} file is obtained from
-- at command{lilypond-book}, @xref{Invoking lilypond-book}, for details. PDF
-+ at command{lilypond-book}, @xref{lilypond-book}, for details. PDF
- can then be produced with a PostScript to PDF translator like
- @code{ps2pdf} (which is part of GhostScript). Running @command{dvips}
- will produce some warnings about fonts; these are harmless and may
-@@ -677,7 +677,7 @@
+@@ -48,7 +48,7 @@
+ * An example of a musicological document::
+ * Integrating music and text::
+ * Music fragment options::
+-* Invoking lilypond-book::
++* lilypond-book::
+ * Filename extensions::
+ * Alternate methods of mixing text and music::
+ @end menu
+@@ -363,7 +363,7 @@
+ @seealso
+ There are specific @command{lilypond-book} command line options and
+ other details to know when processing @LaTeX{} documents, see
+- at ref{Invoking lilypond-book}.
++ at ref{lilypond-book}.
+
+
+ @node Texinfo
+@@ -765,7 +765,7 @@
@end table
@@ -98,38 +95,48 @@
@section Invoking @command{lilypond-book}
@command{lilypond-book} produces a file with one of the following
-@@ -802,7 +802,7 @@
+@@ -953,8 +953,8 @@
You can use any filename extension for the input file, but if you do not
use the recommended extension for a particular format you may need to
--manually specify the output format. @xref{Invoking lilypond-book}, for
-+manually specify the output format. @xref{lilypond-book}, for
- details. Otherwise, @command{lilypond-book} automatically selects the
- output format based on the input filename's extension.
+-manually specify the output format; for details, see @ref{Invoking
+-lilypond-book}. Otherwise, @command{lilypond-book} automatically
++manually specify the output format; for details, see @ref{lilypond-book}.
++Otherwise, @command{lilypond-book} automatically
+ selects the output format based on the input filename's extension.
+ @quotation
--- lilypond-2.10.0/Documentation/user/lilypond.tely.orig 2006-11-10 14:44:25.000000000 +0100
+++ lilypond-2.10.0/Documentation/user/lilypond.tely 2006-11-20 20:15:39.171021750 +0100
-@@ -26,15 +26,15 @@
+@@ -35,19 +35,19 @@
@c
- @c Info files are installed in subdirectories to allow images to be present.
- @c
-- at dircategory LilyPond
-+ at dircategory LilyPond:
+ @c Info files are no longer installed in a subdirectory, images are
+ @c expected to be found in lilypond/ subdirectory.
+- at dircategory GNU LilyPond --- the music typesetter
++ at dircategory GNU LilyPond --- the music typesetter:
@direntry
--* LilyPond: (lilypond/lilypond). The GNU music typesetter.
--* abc2ly: (lilypond/lilypond)Invoking abc2ly. Importing ABC.
--* convert-ly: (lilypond/lilypond)Invoking convert-ly. Older LilyPond versions.
--* etf2ly: (lilypond/lilypond)Invoking etf2ly. Importing Finale.
--* lilypond-book: (lilypond/lilypond)LilyPond-book. Itegrating text and music.
--* midi2ly: (lilypond/lilypond)Invoking midi2ly. Importing MIDI.
--* mup2ly: (lilypond/lilypond)Invoking mup2ly. Importing Mup.
-+* LilyPond: (lilypond/lilypond). The GNU music typesetter
-+* abc2ly: (lilypond/lilypond)abc2ly. Importing ABC
-+* convert-ly: (lilypond/lilypond)convert-ly. Older LilyPond versions
-+* etf2ly: (lilypond/lilypond)etf2ly. Importing Finale
-+* lilypond-book: (lilypond/lilypond)LilyPond-book. Itegrating text and music
-+* midi2ly: (lilypond/lilypond)midi2ly. Importing MIDI
-+* mup2ly: (lilypond/lilypond)mup2ly. Importing Mup
+-* LilyPond Learning Manual: (lilypond-learning). Start here.
+-* Music Glossary: (music-glossary). For non-English users.
+-* LilyPond: (lilypond). LilyPond Notation Reference.
+-* LilyPond Internals Reference: (lilypond-internals). Definitions for tweaking.
+-* LilyPond Application Usage: (lilypond-program). Installing and running applications.
+-* abc2ly: (lilypond-program)Invoking abc2ly. Importing ABC.
+-* convert-ly: (lilypond-program)Updating files with convert-ly. Older LilyPond versions.
+-* etf2ly: (lilypond-program)Invoking etf2ly. Importing Finale.
+-* lilypond-book: (lilypond-program)LilyPond-book. Integrating text and music.
+-* midi2ly: (lilypond-program)Invoking midi2ly. Importing MIDI.
+-* musicxml2ly: (lilypond-program)Invoking musicxml2ly. Importing MusicXML.
++* LilyPond Learning Manual: (lilypond-learning). Start here
++* Music Glossary: (music-glossary). For non-English users
++* LilyPond: (lilypond). LilyPond Notation Reference
++* LilyPond Internals Reference: (lilypond-internals). Definitions for tweaking
++* LilyPond Application Usage: (lilypond-program). Installing and running applications
++* abc2ly: (lilypond-program)abc2ly. Importing ABC
++* convert-ly: (lilypond-program)Updating files with convert-ly. Older LilyPond versions
++* etf2ly: (lilypond-program)etf2ly. Importing Finale
++* lilypond-book: (lilypond-program)LilyPond-book. Integrating text and music
++* midi2ly: (lilypond-program)midi2ly. Importing MIDI
++* musicxml2ly: (lilypond-program)musicxml2ly. Importing MusicXML
@end direntry
@c don't remove this comment.
@@ -147,17 +154,17 @@
@end direntry
@ifhtml
---- lilypond-2.10.0/Documentation/user/non-music.itely.orig 2006-11-10 14:44:25.000000000 +0100
-+++ lilypond-2.10.0/Documentation/user/non-music.itely 2006-11-20 22:02:52.933106750 +0100
-@@ -178,7 +178,7 @@
- @code{-dclip-systems}. The clips are output as EPS files, and are
+--- lilypond-2.10.0/Documentation/user/input.itely.orig 2006-11-10 14:44:25.000000000 +0100
++++ lilypond-2.10.0/Documentation/user/input.itely 2006-11-20 22:02:52.933106750 +0100
+@@ -1324,7 +1324,7 @@
+ @code{-dclip-systems}. The clips are output as EPS files, and are
converted to PDF and PNG if these formats are switched on as well.
--For more information on output formats, see @ref{Invoking lilypond}.
-+For more information on output formats, see @ref{lilypond}.
-
- @seealso
+-For more information on output formats, see @rprogram{Invoking lilypond}.
++For more information on output formats, see @rprogram{lilypond}.
+ @node Skipping corrected music
+ @subsection Skipping corrected music
--- lilypond-2.10.0/scm/documentation-lib.scm.orig 2006-11-10 14:44:26.000000000 +0100
+++ lilypond-2.10.0/scm/documentation-lib.scm 2006-11-20 20:16:58.303967250 +0100
@@ -111,10 +111,10 @@
================================================================
Index: packages/lilypond/lilypond.spec
diff -u packages/lilypond/lilypond.spec:1.54 packages/lilypond/lilypond.spec:1.55
--- packages/lilypond/lilypond.spec:1.54 Sun Sep 7 21:02:34 2008
+++ packages/lilypond/lilypond.spec Sun Jun 21 13:23:15 2009
@@ -9,18 +9,15 @@
Summary: Music typesetter
Summary(pl.UTF-8): Program do składania nut
Name: lilypond
-Version: 2.10.33
-Release: 5
+Version: 2.12.2
+Release: 1
License: GPL
Group: Applications/Sound
-Source0: http://lilypond.org/download/v2.10/%{name}-%{version}.tar.gz
-# Source0-md5: 86a67fcc404e942be723f8a72988b286
+Source0: http://lilypond.org/download/v2.12/%{name}-%{version}.tar.gz
+# Source0-md5: 681dfbecf8a3710d1400cf9488be716b
Patch0: %{name}-info.patch
Patch1: %{name}-sh.patch
-Patch2: %{name}-po.patch
Patch3: %{name}-afm.patch
-Patch4: %{name}-gcc3.patch
-Patch5: %{name}-gcc43.patch
URL: http://www.lilypond.org/
%{?with_docs:BuildRequires: ImageMagick}
%{?with_docs:BuildRequires: ImageMagick-coder-png}
@@ -29,36 +26,40 @@
BuildRequires: flex >= 2.5.4a
BuildRequires: fontconfig
BuildRequires: fontconfig-devel >= 1:2.2.0
-BuildRequires: fontforge >= 20050624
-BuildRequires: gettext-devel
+BuildRequires: fontforge >= 20060125
+BuildRequires: fonts-Type1-urw
+BuildRequires: gettext-devel >= 0.17
BuildRequires: ghostscript >= 8.15
+%{?with_docs:BuildRequires: ghostscript >= 8.60}
BuildRequires: ghostscript-fonts-std
%{?with_gui:BuildRequires: gtk+2-devel >= 2:2.4.0}
-BuildRequires: guile-devel >= 5:1.6.7
+BuildRequires: guile-devel >= 5:1.8.2
BuildRequires: kpathsea-devel
BuildRequires: libltdl-devel
-BuildRequires: libstdc++-devel >= 5:3.3
+BuildRequires: libstdc++-devel >= 5:3.4
BuildRequires: mftrace >= 1.1.19
%{?with_docs:BuildRequires: netpbm-progs}
-BuildRequires: pango-devel >= 1.6.0
+BuildRequires: pango-devel >= 1.12.0
+BuildRequires: perl-base
BuildRequires: pkgconfig >= 1:0.9.0
-BuildRequires: python-devel >= 2.1
+BuildRequires: python-devel >= 2.4
%{?with_docs:BuildRequires: rsync}
BuildRequires: tetex-dvips
BuildRequires: tetex-fonts-cm
BuildRequires: tetex-fonts-cmextra
BuildRequires: tetex-fonts-jknappen
%{?with_docs:BuildRequires: tetex-latex-bibtex}
-BuildRequires: texinfo >= 4.7
+BuildRequires: tetex-metapost
+BuildRequires: texinfo >= 4.11
%{?with_docs:BuildRequires: texinfo-texi2dvi}
BuildConflicts: lilypond < 1.6.0
Requires: ghostscript >= 8.15
-Requires: guile >= 5:1.6.5
-Requires: python >= 2.1
+Requires: guile >= 5:1.8.2
+Requires: python >= 2.4
Requires: tetex-format-latex >= 1.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define texmfdir /usr/share/texmf
+%define texmfdir %{_datadir}/texmf
%define texfontsdir %{texmfdir}/fonts
%description
@@ -105,10 +106,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%patch3 -p1
-%patch4 -p0
-%patch5 -p1
%build
cp -f /usr/share/automake/config.* stepmake/bin
@@ -121,7 +119,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{texmfdir}/{dvips/misc,tex},%{texfontsdir}/{source,tfm,type1}}
+install -d $RPM_BUILD_ROOT{%{texmfdir}/{dvips,tex},%{texfontsdir}/{source,tfm,type1}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -129,12 +127,11 @@
%{__make} -j1 web-install \
DESTDIR=$RPM_BUILD_ROOT
%endif
+cp -aL out/share/lilypond/current/fonts/tfm \
+ $RPM_BUILD_ROOT%{texfontsdir}/tfm/lilypond
find $RPM_BUILD_ROOT -name fonts.cache-1 | xargs rm -f
-# for dvips
-mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/dvips \
- $RPM_BUILD_ROOT%{texmfdir}/dvips/lilypond
# ?
mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/source \
$RPM_BUILD_ROOT%{texfontsdir}/source/lilypond
@@ -144,11 +141,9 @@
# both for lilypond and dvips
ln -sf %{_datadir}/lilypond/%{version}/fonts/type1 \
$RPM_BUILD_ROOT%{texfontsdir}/type1/lilypond
-ln -sf %{_datadir}/lilypond/%{version}/ps/music-drawing-routines.ps \
- $RPM_BUILD_ROOT%{texmfdir}/dvips/misc
-
-# no need for subdir
-mv -f $RPM_BUILD_ROOT%{_infodir}/lilypond/*.info* $RPM_BUILD_ROOT%{_infodir}
+ln -sf %{_datadir}/lilypond/%{version}/ps \
+ $RPM_BUILD_ROOT%{texmfdir}/dvips/lilypond
+rm -rf $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/dvips
# vim syntax/etc. files
install -d $RPM_BUILD_ROOT%{_datadir}/vim
@@ -175,13 +170,15 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS.txt ChangeLog DEDICATION NEWS.txt README.txt THANKS
+%doc AUTHORS.txt DEDICATION NEWS.txt README.txt THANKS
%attr(755,root,root) %{_bindir}/abc2ly
%attr(755,root,root) %{_bindir}/convert-ly
%attr(755,root,root) %{_bindir}/etf2ly
+%attr(755,root,root) %{_bindir}/lilymidi
%attr(755,root,root) %{_bindir}/lilypond
%attr(755,root,root) %{_bindir}/lilypond-book
%attr(755,root,root) %{_bindir}/lilypond-invoke-editor
+%attr(755,root,root) %{_bindir}/lilysong
%attr(755,root,root) %{_bindir}/midi2ly
%attr(755,root,root) %{_bindir}/musicxml2ly
%dir %{_libdir}/lilypond
@@ -201,9 +198,9 @@
%{_mandir}/man1/*
%{texfontsdir}/source/lilypond
+%{texfontsdir}/tfm/lilypond
%{texfontsdir}/type1/lilypond
%{texmfdir}/dvips/lilypond
-%{texmfdir}/dvips/misc/*.ps
%{texmfdir}/tex/lilypond
%{_datadir}/omf/lilypond
@@ -227,6 +224,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.55 2009/06/21 11:23:15 gotar
+- upgraded to 2.12.2;
+- updated patches (info, afm), obsoleted po, gcc43 and gcc3 (req. 3.4 not 3.3),
+- updated BRs (versions, added fonts-Type1-urw, perl-base and tetex-metapost),
+- note: texmfdir should be replaced somewhere with texmfdist for texlive (!),
+- fixed %{texmfdir}/dvips contents, package tfm files, lilymidi and lilysong
+
Revision 1.54 2008/09/07 19:02:34 adamg
- release 5 (against libltdl-2.2.6-1)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lilypond/lilypond-afm.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lilypond/lilypond-info.patch?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lilypond/lilypond.spec?r1=1.54&r2=1.55&f=u
More information about the pld-cvs-commit
mailing list