rpms/koffice/devel koffice.spec,1.109,1.110

[Rex Dieter]

Author: rdieter

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

Modified Files:
	koffice.spec 
Log Message:
use external lilypad fonts only where available (ie, F-11+)



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- koffice.spec	1 Jul 2009 15:15:47 -0000	1.109
+++ koffice.spec	6 Jul 2009 12:37:31 -0000	1.110
@@ -5,10 +5,14 @@
 #define kivio 1
 #define kugar 1
 
+%if 0%{?fedora} > 10
+%define external_lilypond_fonts 1
+%endif
+
 Name:           koffice
 Epoch:          2 
 Version:        2.0.1
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -105,7 +109,9 @@ KOffice is an integrated office suite.
 %package core
 Summary:        Core support files for koffice
 Group:          Applications/Productivity
+%if 0%{?external_lilypond_fonts}
 Requires:       lilypond-emmentaler-fonts
+%endif
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 %if ! 0%{?kchart}
 Obsoletes: koffice-kchart < %{epoch}:%{version}-%{release}
@@ -288,7 +294,9 @@ make install/fast DESTDIR=%{buildroot} -
 
 # unpackaged files
 # fonts
+%if 0%{?external_lilypond_fonts}
 rm -fv %{buildroot}%{_kde4_appsdir}/musicshape/fonts/Emmentaler-14.ttf
+%endif
 # conflicts with oxygen-icon-theme  
 rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-justify-{center,fill,left,right}.png
 rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-text-{bold,italic,underline}.png