rpms/koffice/devel .cvsignore, 1.32, 1.33 koffice.spec, 1.119, 1.120 sources, 1.32, 1.33

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.82-1
- koffice-2.0.82 (2.1beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	26 Aug 2009 20:59:21 -0000	1.32
+++ .cvsignore	11 Sep 2009 15:57:23 -0000	1.33
@@ -1 +1,2 @@
 koffice-2.0.81.tar.bz2
+koffice-2.0.82.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- koffice.spec	27 Aug 2009 17:21:44 -0000	1.119
+++ koffice.spec	11 Sep 2009 15:57:23 -0000	1.120
@@ -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:          2 
-Version:        2.0.81
-Release:        3%{?dist}
+Version:        2.0.82
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -63,12 +63,10 @@ BuildRequires: OpenEXR-devel
 BuildRequires: perl
 BuildRequires: poppler-qt4-devel
 BuildRequires: pstoedit
-BuildRequires: python-devel
 BuildRequires: qca2-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: readline-devel
-BuildRequires: ruby-devel ruby
-BuildRequires: wv2-devel
+BuildRequires: wv2-devel >= 0.4.0
 
 %description
 KOffice is an integrated office suite.
@@ -511,32 +509,33 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/libchartshapelib.so.*
 %{_kde4_libdir}/libkdchart.so.*
 %{_kde4_libdir}/libkoaction.so.*
-%{_kde4_libdir}/libkoaspectbutton.so.*
+#{_kde4_libdir}/libkoaspectbutton.so.*
 %{_kde4_libdir}/libkobase.so.*
-%{_kde4_libdir}/libkocharacterselectiondialog.so.*
+#{_kde4_libdir}/libkocharacterselectiondialog.so.*
 %{_kde4_libdir}/libkochart.so.*
 %{_kde4_libdir}/libkocolorwidgets.so.*
-%{_kde4_libdir}/libkocvsimport.so.*
-%{_kde4_libdir}/libkodocumentsectionbox.so.*
+#{_kde4_libdir}/libkocvsimport.so.*
+#{_kde4_libdir}/libkodocumentsectionbox.so.*
 %{_kde4_libdir}/libkoffice_graya_u16.so.*
 %{_kde4_libdir}/libkofficegrayau8colorspace.so.*
-%{_kde4_libdir}/libkoinput.so.*
+#{_kde4_libdir}/libkoinput.so.*
 %{_kde4_libdir}/libkokross.so.*
-%{_kde4_libdir}/libkolinestyleselector.so.*
+#{_kde4_libdir}/libkolinestyleselector.so.*
 %{_kde4_libdir}/libkomain.so.*
 %{_kde4_libdir}/libkoodf.so.*
-%{_kde4_libdir}/libkoopenpane.so.*
+#{_kde4_libdir}/libkoopenpane.so.*
 %{_kde4_libdir}/libkopageapp.so.*
-%{_kde4_libdir}/libkopagelayout.so.*
-%{_kde4_libdir}/libkopicture.so.*
+#{_kde4_libdir}/libkopagelayout.so.*
+#{_kde4_libdir}/libkopicture.so.*
 %{_kde4_libdir}/libkoplugin.so.*
-%{_kde4_libdir}/libkoprogress.so.*
+#{_kde4_libdir}/libkoprogress.so.*
 %{_kde4_libdir}/libkoresources.so.*
-%{_kde4_libdir}/libkoresourcewidget.so.*
+#{_kde4_libdir}/libkoresourcewidget.so.*
 %{_kde4_libdir}/libkostore.so.*
 %{_kde4_libdir}/libkotext.so.*
+%{_kde4_libdir}/libkowidgets.so.*
 %{_kde4_libdir}/libkowmf.so.*
-%{_kde4_libdir}/libkozoomaction.so.*
+#{_kde4_libdir}/libkozoomaction.so.*
 %{_kde4_libdir}/libkspreadcommon.so.*
 %{_kde4_libdir}/libkwmf.so.*
 %if 0%{?kformula}
@@ -743,6 +742,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/libhtmlimport.*
 %{_kde4_libdir}/kde4/libkspreadlatexexport.*
 %{_kde4_libdir}/kde4/libkwordkword1dot3import.*
+%{_kde4_libdir}/kde4/libmswordodf_import.*
 %{_kde4_libdir}/kde4/libmswriteexport.*
 %{_kde4_libdir}/kde4/libmswriteimport.*
 %{_kde4_libdir}/kde4/liboowriterexport.*
@@ -808,6 +808,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.82-1
+- koffice-2.0.82 (2.1beta2)
+
 * Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-3
 - fixup some cross dependencies between -filters -kplato -krita
 
@@ -815,7 +818,7 @@ update-desktop-database -q &> /dev/null 
 - fix %%files
 
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-1
-- koffice-2.0.81
+- koffice-2.0.81 (2.1beta1)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:2.0.1-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	26 Aug 2009 20:59:21 -0000	1.32
+++ sources	11 Sep 2009 15:57:23 -0000	1.33
@@ -1 +1,2 @@
 d880b2d479c465d3d2cde7146007afbd  koffice-2.0.81.tar.bz2
+25080954dd83b0d7d480b66bd89d1374  koffice-2.0.82.tar.bz2