rpms/denemo/devel denemo-0.8.0-font.patch, NONE, 1.1 denemo.spec, 1.3, 1.4 denemo-binreloc.patch, 1.1, NONE denemo-block_debug.patch, 1.1, NONE denemo-undo-assert.patch, 1.1, NONE

[Roy Rankin]

Author: rrankin

Update of /cvs/pkgs/rpms/denemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv387

Modified Files:
	denemo.spec 
Added Files:
	denemo-0.8.0-font.patch 
Removed Files:
	denemo-binreloc.patch denemo-block_debug.patch 
	denemo-undo-assert.patch 
Log Message:
Font packages as seperate RPM as per bugzilla 477375


denemo-0.8.0-font.patch:

--- NEW FILE denemo-0.8.0-font.patch ---
diff --git a/LICENSE_OFL.txt b/LICENSE_OFL.txt
index e69de29..e6c5fe8 100644
--- a/LICENSE_OFL.txt
+++ b/LICENSE_OFL.txt
@@ -0,0 +1,100 @@
+LICENSE FOR FONTS MusiQwik, MusiQwikB, MusiSync.
+
+
+Copyright (c) 2001, 2008, Robert Allgeyer http://www.icogitate.com/~ergosum/fonts/musicfonts.htm,
+with Reserved Font Name "MusiQwik".
+
+Copyright (c) 2001, 2008, Robert Allgeyer http://www.icogitate.com/~ergosum/fonts/musicfonts.htm,
+with Reserved Font Name "MusiSync".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/Makefile.am b/Makefile.am
index da242e7..956ebf2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ dist_sysconf_DATA = denemo.conf
 
 EXTRA_DIST = mkinstalldirs  actions/menus doc/DESIGN doc/GOALS @PACKAGE at .spec.in  \
 	     doc/DESIGN.lilypond README.lilypond include actions \
-	     guile-1.8.pc
+	     guile-1.8.pc LICENSE_OFL.txt
 
 MAINTAINERCLEANFILES =  Makefile.in aclocal.m4 configure config.h.in \
 	stamp-h.in \
diff --git a/Makefile.in b/Makefile.in
index e72b16f..015c91b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -191,7 +191,7 @@ dist_sysconf_DATA = denemo.conf
 
 EXTRA_DIST = mkinstalldirs  actions/menus doc/DESIGN doc/GOALS @PACKAGE at .spec.in  \
 	     doc/DESIGN.lilypond README.lilypond include actions \
-	     guile-1.8.pc
+	     guile-1.8.pc LICENSE_OFL.txt
 
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \


Index: denemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/denemo/devel/denemo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- denemo.spec	7 Jan 2009 11:32:16 -0000	1.3
+++ denemo.spec	19 Jan 2009 23:33:01 -0000	1.4
@@ -1,11 +1,16 @@
 Summary: Graphical music notation program
 Name: denemo
 Version: 0.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 Source: http://download.savannah.gnu.org/releases/denemo/%{name}-%{version}.tar.gz
+
+
+#This patch fixes the base Makefile to allow RPMs to be built
 Patch0: %{name}-0.8.0-make.patch
+#This patch adds the font license 
+Patch1: %{name}-0.8.0-font.patch
 
 URL: http://www.denemo.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,7 +18,18 @@
 BuildRequires: portaudio-devel aubio-devel gtk2-devel guile-devel
 BuildRequires: gettext libxml2-devel fftw-devel desktop-file-utils
 BuildRequires: libtool-ltdl-devel
+BuildRequires: chrpath fontpackages-devel
+
 Requires: bug-buddy
+Requires: denemo-music-fonts
+
+%package music-fonts
+Summary:	Music notation fonts used in Denemo
+Group: 		Fonts
+License: 	OFL
+Version: 	4.10
+Requires:	fontpackages-filesystem
+
 
 
 %description
@@ -25,21 +41,37 @@
 (http://www.cs.uu.nl/hanwen/lilypond/), but is adaptable to other
 computer-music-related purposes as well. 
 
+%description music-fonts
+This font set witten by Robert Allgeyer is the 2001 legacy version
+of MusiSync. It is a musical notations font set which was reordered 
+by Richard Shann for Denemo. 
+
+This font set is used by Denemo.
+
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 %build
 %configure 
+# these files need to be removed upstream
+find actions -name \*~ -exec rm -f {} +
 make %{?_smp_mflags}
+chrpath -d src/denemo
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-desktop-file-install --vendor="" \
-        --dir=%{buildroot}/%{_datadir}/applications     \
-        %{buildroot}/%{_datadir}/applications/denemo.desktop
+desktop-file-install --vendor=""\
+	--dir=%{buildroot}/%{_datadir}/applications\
+	%{buildroot}/%{_datadir}/applications/denemo.desktop
 %find_lang %{name}
+install -m 0755 -d %{buildroot}%{_fontdir}
+
+# move the location of the music font
+install -m 0644 -p fonts/*.ttf %{buildroot}%{_fontdir}
+rm -rf %{buildroot}/%{_datadir}/fonts/truetype
 
 %clean
 rm -rf %{buildroot}
@@ -50,12 +82,21 @@
 %config(noreplace) %{_sysconfdir}/denemo/denemo.conf
 %{_datadir}/denemo
 %{_datadir}/icons/denemo.png
-%{_datadir}/fonts/truetype/denemo
 %{_datadir}/applications/denemo.desktop
 %{_bindir}/denemo
 %doc COPYING README README.lilypond ChangeLog 
 
+
+
+
+%_font_pkg -n music *.ttf
+%doc LICENSE_OFL.txt
+
+
 %changelog
+* Tue Jan 20 2009 Roy Rankin <rrankin at ihug.com.au> - 0.8.0-2
+-Font split into seperate RPM package (Bugzilla 477375)
+
 * Sun Nov 30 2008 Roy Rankin <rrankin at ihug.com.au> - 0.8.0-1
 -Update for Denemo release 0.8.0
 


--- denemo-binreloc.patch DELETED ---


--- denemo-block_debug.patch DELETED ---


--- denemo-undo-assert.patch DELETED ---