rpms/lilypond/F-10 lilypond-2.21.2-gcc44-relocate.patch, NONE, 1.1 lilypond-consts.patch, NONE, 1.1 lilypond.spec, 1.28, 1.29 sources, 1.21, 1.22

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/lilypond/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28427

Modified Files:
	lilypond.spec sources 
Added Files:
	lilypond-2.21.2-gcc44-relocate.patch lilypond-consts.patch 
Log Message:
Backport F-11 font changes, BZ 477416


lilypond-2.21.2-gcc44-relocate.patch:

--- NEW FILE lilypond-2.21.2-gcc44-relocate.patch ---
--- lily/relocate.cc.orig	2009-02-20 08:23:11.000000000 -0600
+++ lily/relocate.cc	2009-02-20 08:23:11.000000000 -0600
@@ -18,0 +19 @@
+#include <cstring>

lilypond-consts.patch:

--- NEW FILE lilypond-consts.patch ---
diff -ru lilypond-2.12.2.orig/lily/relocate.cc lilypond-2.12.2/lily/relocate.cc
--- lilypond-2.12.2.orig/lily/relocate.cc	2009-03-04 15:27:38.000000000 +0000
+++ lilypond-2.12.2/lily/relocate.cc	2009-03-04 15:28:14.000000000 +0000
@@ -276,13 +276,13 @@
   string out;
   while (ptr < start_ptr + len)
     {
-      char *dollar = strchr (ptr, '$');
+      const char *dollar = strchr (ptr, '$');
       
       if (dollar != NULL)
 	{
-	  char *start_var = dollar + 1;
-	  char *end_var = start_var;
-	  char *start_next = end_var;
+	  const char *start_var = dollar + 1;
+	  const char *end_var = start_var;
+	  const char *start_next = end_var;
 	  
 	  out += string (ptr, dollar - ptr);
 	  ptr = dollar;


Index: lilypond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/F-10/lilypond.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- lilypond.spec	15 Jun 2009 16:52:21 -0000	1.28
+++ lilypond.spec	14 Jul 2009 13:03:24 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		lilypond
-Version:	2.12.0
-Release:	2%{?dist}
+Version:	2.12.2
+Release:	4%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -9,11 +9,21 @@ URL:		http://www.lilypond.org
 Source0:	http://download.linuxaudio.org/lilypond/sources/v2.12/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		lilypond-2.11.65-python26.patch
-Patch1:		lilypond-2.12.0-parse-scm.patch
+#Patch1:		lilypond-2.12.0-parse-scm.patch
+Patch2:		lilypond-2.21.2-gcc44-relocate.patch
+Patch3:		lilypond-consts.patch
 
 Requires:	ghostscript >= 8.15
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+Obsoletes: 	lilypond-fonts <= 2.12.1-1
+Requires:	lilypond-aybabtu-fonts = %{version}-%{release}
+Requires:	lilypond-century-schoolbook-l-fonts = %{version}-%{release}
+Requires:	lilypond-emmentaler-fonts = %{version}-%{release}
+Requires:	lilypond-feta-fonts = %{version}-%{release}
+Requires:	lilypond-feta-alphabet-fonts = %{version}-%{release}
+Requires:	lilypond-feta-braces-fonts = %{version}-%{release}
+Requires:	lilypond-parmesan-fonts = %{version}-%{release}
 
 Buildrequires:  t1utils bison flex ImageMagick gettext tetex
 BuildRequires:  python-devel >= 2.4.0
@@ -22,18 +32,125 @@ BuildRequires:  texinfo >= 4.8
 BuildRequires:  guile-devel >= 1.8
 BuildRequires:  ghostscript >= 8.15
 BuildRequires:  pango-devel >= 1.12.0
+BuildRequires:  fontpackages-devel
 
 %description
 LilyPond is an automated music engraving system. It formats music
 beautifully and automatically, and has a friendly syntax for its input
 files.
 
+%package aybabtu-fonts
+Summary:	Lilypond aybabtu font
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+Requires:	lilypond-fonts-common = %{version}-%{release}
+
+%description aybabtu-fonts 
+LilyPond is an automated music engraving system. It formats music
+beautifully and automatically, and has a friendly syntax for its input
+files.
+
+This is the aybabtu font included in the package.
+
+%package century-schoolbook-l-fonts
+Summary:        Lilypond Century Schoolbook L fonts
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+Requires:	lilypond-fonts-common = %{version}-%{release}
+Obsoletes:	lilypond-centuryschl-fonts <= 2.12.1-3
+
+%description century-schoolbook-l-fonts 
+LilyPond is an automated music engraving system. It formats music
+beautifully and automatically, and has a friendly syntax for its input
+files.
+
+These are the Century Schoolbook L fonts included in the package.
+
+%package emmentaler-fonts
+Summary:        Lilypond emmentaler fonts
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+Requires:	lilypond-fonts-common = %{version}-%{release}
+
+%description emmentaler-fonts 
+LilyPond is an automated music engraving system. It formats music
+beautifully and automatically, and has a friendly syntax for its input
+files.
+
+These are the emmentaler fonts included in the package.
+
+%package feta-fonts
+Summary:        Lilypond feta fonts
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+Requires:	lilypond-fonts-common = %{version}-%{release}
+
+%description feta-fonts 
+LilyPond is an automated music engraving system. It formats music
+beautifully and automatically, and has a friendly syntax for its input
+files.
+
+These are the feta fonts included in the package.
+
+%package feta-alphabet-fonts
+Summary:        Lilypond feta-alphabet fonts
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+Requires:	lilypond-fonts-common = %{version}-%{release}
+
+%description feta-alphabet-fonts 
+LilyPond is an automated music engraving system. It formats music
+beautifully and automatically, and has a friendly syntax for its input
+files.
+
+These are the feta-alphabet fonts included in the package.
+
+%package feta-braces-fonts
+Summary:        Lilypond feta-braces fonts
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+Requires:	lilypond-fonts-common = %{version}-%{release}
+
+%description feta-braces-fonts 
+LilyPond is an automated music engraving system. It formats music
+beautifully and automatically, and has a friendly syntax for its input
+files.
+
+These are the feta-braces fonts included in the package.
+
+%package parmesan-fonts
+Summary:        Lilypond parmesan fonts
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+Requires:	lilypond-fonts-common = %{version}-%{release}
+
+%description parmesan-fonts 
+LilyPond is an automated music engraving system. It formats music
+beautifully and automatically, and has a friendly syntax for its input
+files.
+
+These are the parmesan fonts included in the package.
+
+%package fonts-common
+Summary:        Lilypond fonts common dir
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+
+
+%description fonts-common
+LilyPond is an automated music engraving system. It formats music
+beautifully and automatically, and has a friendly syntax for its input
+files.
+
+This contains the directory common to all lilypond fonts.
 
 %prep
 %setup -q
 
 %patch0 -p0
-%patch1 -p0
+#%patch1 -p0
+%patch2 -p0
+%patch3 -p1
 
 %build
 %configure --without-kpathsea --disable-checking \
@@ -65,6 +182,14 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %{name}
 
+mkdir -p $RPM_BUILD_ROOT%{_fontdir}
+mv $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf/*.otf $RPM_BUILD_ROOT%{_fontdir}
+mv $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/type1/*.pfb $RPM_BUILD_ROOT%{_fontdir}
+rmdir $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf
+rmdir $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/type1
+ln -s %{_fontdir} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf
+ln -s %{_fontdir} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/type1
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,11 +219,66 @@ fi
 %{_mandir}/man1/*
 %{_datadir}/omf/lilypond
 
+%_font_pkg -n aybabtu aybabtu.otf
+
+%_font_pkg -n century-schoolbook-l CenturySchL*otf
+
+%_font_pkg -n emmentaler emmentaler*otf
+
+%_font_pkg -n feta feta1*pfb feta2*pfb
+
+%_font_pkg -n feta-alphabet feta-alphabet*pfb
+
+%_font_pkg -n feta-braces feta-braces*pfb
+
+%_font_pkg -n parmesan parmesan*pfb
+
+
+%files fonts-common
+%defattr(0644,root,root,0755)
+
+%dir %{_fontdir}
+
 
 %changelog
-* Mon Jun 15 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.0-2
+* Mon Jun 01 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.2-4
 - Update for vim 7.2, BZ 503429.
 
+* Wed Mar 04 2009 Caolán McNamara <caolanm at redhat.com> - 2.12.2-3
+- fix up strchr const rets for const arg
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 19 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.2-1
+- Update to 2.12.2.
+- Patch for gcc 4.4.
+
+* Thu Feb 19 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-6
+- Split out feta and parmesan type1 fonts.
+
+* Fri Jan 23 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-5
+- Final font corrections.
+
+* Thu Jan 22 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-4
+- More font refinements.
+
+* Wed Jan 21 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-3
+- Drop feta-fonts package cruft.
+
+* Wed Jan 14 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-2
+- Implementing font_pkg.
+
+* Tue Jan 06 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-1
+- Update to 2.12.1.
+- Droppedn parse-scm patch, applied upstream.
+
+* Tue Dec 30 2008 Jon Ciesla <limb at jcomserv.net> - 2.12.0-3
+- Split out fonts subpackage, BZ 477416.
+
+* Tue Dec 30 2008 Jon Ciesla <limb at jcomserv.net> - 2.12.0-2
+- Re-fix Source0 URL.
+
 * Wed Dec 17 2008 Jon Ciesla <limb at jcomserv.net> - 2.12.0-1
 - New upstream, BZ 476836.
 - Fixed Source0 URL.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	30 Dec 2008 12:59:42 -0000	1.21
+++ sources	14 Jul 2009 13:03:24 -0000	1.22
@@ -1 +1 @@
-592581b3e8e022a8152d3325eefd9e88  lilypond-2.12.0.tar.gz
+681dfbecf8a3710d1400cf9488be716b  lilypond-2.12.2.tar.gz