rpms/koffice/devel .cvsignore, 1.35, 1.36 koffice.spec, 1.125, 1.126 sources, 1.35, 1.36

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Fri Oct 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.91-1
- koffice-2.0.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	4 Oct 2009 02:34:30 -0000	1.35
+++ .cvsignore	24 Oct 2009 04:37:59 -0000	1.36
@@ -1 +1 @@
-koffice-2.0.83.tar.bz2
+koffice-2.0.91.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- koffice.spec	9 Oct 2009 16:17:27 -0000	1.125
+++ koffice.spec	24 Oct 2009 04:38:00 -0000	1.126
@@ -1,7 +1,7 @@
 
 #define kchart 1
 #define kexi 1
-#define kformula 1
+%define kformula 1
 #define kivio 1
 #define kugar 1
 
@@ -11,8 +11,8 @@
 
 Name:           koffice
 Epoch:          3 
-Version:        2.0.83
-Release:        2%{?dist}
+Version:        2.0.91
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -67,7 +67,7 @@ BuildRequires: pstoedit
 BuildRequires: qca2-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: readline-devel
-BuildRequires: wv2-devel >= 0.4.1
+BuildRequires: wv2-devel >= 1:0.4.1
 
 %description
 KOffice is an integrated office suite.
@@ -305,8 +305,8 @@ make install/fast DESTDIR=%{buildroot} -
 %if 0%{?external_lilypond_fonts}
 rm -fv %{buildroot}%{_kde4_appsdir}/musicshape/fonts/Emmentaler-14.ttf
 %endif
-rm -rfv %{buildroot}%{_kde4_appsdir}/apps/kformula/fonts/
-# conflicts with oxygen-icon-theme  
+rm -rfv %{buildroot}%{_kde4_appsdir}/apps/formulashape/fonts/
+ 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
 rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-{group,ungroup}.png
@@ -449,7 +449,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/koffice_graya_u16_plugin.so
 %{_kde4_libdir}/kde4/kofficegrayau8plugin.so
 %{_kde4_libdir}/kde4/kofficedockers.so
-%{_kde4_libdir}/kde4/kofficesimpletextedit.so
+#{_kde4_libdir}/kde4/kofficesimpletextedit.so
 %{_kde4_libdir}/kde4/libkounavailpart.*
 %{_kde4_libdir}/kde4/paragraphtool.so
 %{_kde4_libdir}/kde4/spellcheck.so
@@ -472,7 +472,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_datadir}/kde4/services/kofficedockers.desktop
 %{_kde4_datadir}/kde4/services/kopabackgroundtool.desktop
 %{_kde4_datadir}/kde4/services/kounavail.desktop
-%{_kde4_datadir}/kde4/services/kofficesimpletextedit.desktop
+#{_kde4_datadir}/kde4/services/kofficesimpletextedit.desktop
 %{_kde4_datadir}/kde4/services/paragraphtool.desktop
 %{_kde4_datadir}/kde4/services/spellcheck.desktop
 %{_kde4_datadir}/kde4/services/textvariables.desktop
@@ -704,8 +704,8 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_appsdir}/kformula/
 %{_kde4_datadir}/kde4/services/kformula*.desktop
 %{_kde4_datadir}/applications/kde4/*kformula.desktop
-%{_kde4_docdir}/HTML/en/kformula/
-%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
+#{_kde4_docdir}/HTML/en/kformula/
+#{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
 %endif
 
 %if 0%{?kivio}
@@ -807,6 +807,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Fri Oct 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.91-1
+- koffice-2.0.91
+
 * Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.83-2
 - rebuild (wv2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	4 Oct 2009 02:34:30 -0000	1.35
+++ sources	24 Oct 2009 04:38:00 -0000	1.36
@@ -1 +1 @@
-063e08882f01a8b5c4dbc02bad533f20  koffice-2.0.83.tar.bz2
+48a102a389f2fa9a33a2ce5cb88d7baa  koffice-2.0.91.tar.bz2