rpms/koffice/devel .cvsignore, 1.30, 1.31 koffice.spec, 1.107, 1.108 sources, 1.30, 1.31

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Wed Jun 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.1-1
- koffice-2.0.1
- KOffice 2 ships private copy of Emmentaler music font (#507741)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	22 May 2009 12:01:12 -0000	1.30
+++ .cvsignore	24 Jun 2009 12:28:14 -0000	1.31
@@ -1 +1 @@
-koffice-2.0.0.tar.bz2
+koffice-2.0.1.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- koffice.spec	23 May 2009 04:48:26 -0000	1.107
+++ koffice.spec	24 Jun 2009 12:28:14 -0000	1.108
@@ -7,7 +7,7 @@
 
 Name:           koffice
 Epoch:          2 
-Version:        2.0.0
+Version:        2.0.1
 Release:        1%{?dist}
 Summary:        An integrated office suite
 
@@ -52,9 +52,12 @@ BuildRequires: libxslt-devel
 BuildRequires: mysql-devel
 BuildRequires: libpqxx-devel
 %endif
+## when OpenCTL/OpenGTL is ready
+#BuildRequires: OpenGTL-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: perl
 BuildRequires: poppler-qt4-devel
+BuildRequires: pstoedit
 BuildRequires: python-devel
 BuildRequires: qca2-devel
 BuildRequires: qimageblitz-devel
@@ -102,6 +105,7 @@ KOffice is an integrated office suite.
 %package core
 Summary:        Core support files for koffice
 Group:          Applications/Productivity
+Requires:       lilypond-emmentaler-fonts
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 %if ! 0%{?kchart}
 Obsoletes: koffice-kchart < %{epoch}:%{version}-%{release}
@@ -245,6 +249,8 @@ Requires:       mathml-fonts
 Summary:        Import and Export Filters for KOffice
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+# for karbon eps import filter
+Requires:       pstoedit
 
 %description filters
 %{summary}
@@ -281,6 +287,8 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # unpackaged files
+# fonts
+rm -fv %{buildroot}%{_kde4_appsdir}/musicshape/fonts/Emmentaler-14.ttf
 # 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
@@ -751,6 +759,10 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Wed Jun 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.1-1
+- koffice-2.0.1
+- KOffice 2 ships private copy of Emmentaler music font (#507741)
+
 * Fri May 22 2009 Lukáš Tinkl <ltinkl at redhat.com> - 2:2.0.0-1
 - KOffice 2.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	22 May 2009 12:01:13 -0000	1.30
+++ sources	24 Jun 2009 12:28:14 -0000	1.31
@@ -1 +1 @@
-378706eceb6e340b433775dfb5fd78bf  koffice-2.0.0.tar.bz2
+86fb3660c2b87495d1bf84da9044d441  koffice-2.0.1.tar.bz2