rpms/koffice/devel .cvsignore, 1.31, 1.32 koffice.spec, 1.111, 1.112 sources, 1.31, 1.32

Rex Dieter rdieter at fedoraproject.org
Wed Aug 26 20:59:21 UTC 2009 

Author: rdieter

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

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-1
- koffice-2.0.81



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	24 Jun 2009 12:28:14 -0000	1.31
+++ .cvsignore	26 Aug 2009 20:59:21 -0000	1.32
@@ -1 +1 @@
-koffice-2.0.1.tar.bz2
+koffice-2.0.81.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- koffice.spec	25 Jul 2009 04:42:57 -0000	1.111
+++ koffice.spec	26 Aug 2009 20:59:21 -0000	1.112
@@ -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.1
-Release:        3%{?dist}.1
+Version:        2.0.81
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -51,6 +51,7 @@ BuildRequires: libkdcraw-devel >= 0.2.0
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libwpd-devel
+BuildRequires: libwpg-devel
 BuildRequires: libxslt-devel
 %if 0%{?kexi}
 BuildRequires: mysql-devel
@@ -246,8 +247,16 @@ Requires:       %{name}-core = %{epoch}:
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-Requires:       mathml-fonts
-
+#if 0%{?fedora} > 9
+Requires:       lyx-cmex10-fonts
+#else
+#Requires:       mathml-fonts
+#endif
+%if 0%{?fedora} > 10
+Requires:       dejavu-lgc-sans-fonts
+%else
+Requires:       dejavu-lgc-fonts
+%endif
 %description kformula
 %{summary}
 
@@ -284,7 +293,7 @@ pushd %{_target_platform}
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} 
 
 
 %install
@@ -292,11 +301,12 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# unpackaged files
+## unpackaged files
 # fonts
 %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 -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
@@ -424,20 +434,21 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/libkdeinit4_kthesaurus.so
 %{_kde4_libdir}/kde4/autocorrect.so
 %{_kde4_libdir}/kde4/changecase.so
+%{_kde4_libdir}/kde4/clipartthumbnail.*
 %{_kde4_libdir}/kde4/defaulttools.so
 %{_kde4_libdir}/kde4/kodocinfopropspage.*
 %{_kde4_libdir}/kde4/kofficescan.*
 %{_kde4_libdir}/kde4/kofficethumbnail.*
 %{_kde4_libdir}/kde4/kopabackgroundtool.*
-%{_kde4_libdir}/kde4/libkounavailpart.*
-%{_kde4_libdir}/kde4/clipartthumbnail.*
-%{_kde4_libdir}/kde4/thesaurustool.so
 %{_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/libkounavailpart.*
+%{_kde4_libdir}/kde4/paragraphtool.so
 %{_kde4_libdir}/kde4/spellcheck.so
 %{_kde4_libdir}/kde4/textvariables.so
+%{_kde4_libdir}/kde4/thesaurustool.so
 %{_kde4_appsdir}/koffice/
 %{_kde4_docdir}/HTML/en/koffice/
 %{_kde4_docdir}/HTML/en/thesaurus/
@@ -455,10 +466,12 @@ 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/thesaurustool.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
+%{_kde4_datadir}/kde4/services/thesaurustool.desktop
+%{_kde4_datadir}/kde4/servicetypes/filtereffect.desktop
 %{_kde4_datadir}/kde4/servicetypes/kochart.desktop
 %{_kde4_datadir}/kde4/servicetypes/kofficedocker.desktop
 %{_kde4_datadir}/kde4/servicetypes/kofficepart.desktop
@@ -490,18 +503,33 @@ update-desktop-database -q &> /dev/null 
 #exclude %{_kde4_libdir}/kde4/kritashape.*
 %{_kde4_libdir}/libchartshapelib.so.*
 %{_kde4_libdir}/libkdchart.so.*
+%{_kde4_libdir}/libkoaction.so.*
+%{_kde4_libdir}/libkoaspectbutton.so.*
+%{_kde4_libdir}/libkobase.so.*
+%{_kde4_libdir}/libkocharacterselectiondialog.so.*
 %{_kde4_libdir}/libkochart.so.*
-%{_kde4_libdir}/libkotext.so.*
-%{_kde4_libdir}/libkowmf.so.*
+%{_kde4_libdir}/libkocolorwidgets.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}/libkokross.so.*
-%{_kde4_libdir}/libkoguiutils.so.*
+%{_kde4_libdir}/libkolinestyleselector.so.*
 %{_kde4_libdir}/libkomain.so.*
 %{_kde4_libdir}/libkoodf.so.*
+%{_kde4_libdir}/libkoopenpane.so.*
 %{_kde4_libdir}/libkopageapp.so.*
+%{_kde4_libdir}/libkopagelayout.so.*
+%{_kde4_libdir}/libkopicture.so.*
+%{_kde4_libdir}/libkoplugin.so.*
+%{_kde4_libdir}/libkoprogress.so.*
 %{_kde4_libdir}/libkoresources.so.*
+%{_kde4_libdir}/libkoresourcewidget.so.*
 %{_kde4_libdir}/libkostore.so.*
-%{_kde4_libdir}/libkoffice_graya_u16.so.*
-%{_kde4_libdir}/libkofficegrayau8colorspace.so.*
+%{_kde4_libdir}/libkotext.so.*
+%{_kde4_libdir}/libkowmf.so.*
+%{_kde4_libdir}/libkozoomaction.so.*
 %{_kde4_libdir}/libkspreadcommon.so.*
 %{_kde4_libdir}/libkwmf.so.*
 %if 0%{?kformula}
@@ -515,7 +543,6 @@ update-desktop-database -q &> /dev/null 
 # FIXME: include only shlib symlinks we know/want to export
 %{_kde4_libdir}/lib*.so
 %exclude %{_kde4_libdir}/libkdeinit4_*.so
-%exclude %{_kde4_libdir}/libKrita*.so
 %{_kde4_appsdir}/cmake/modules/FindKOfficeLibs.cmake
 
 %files kspread
@@ -554,6 +581,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/kpr_*.*
 %{_kde4_libdir}/kde4/libFilterkpr2odf.so
 %{_kde4_appsdir}/kpresenter/
+%{_kde4_configdir}/kpresenterrc
 %{_kde4_docdir}/HTML/en/kpresenter/
 %{_kde4_datadir}/kde4/services/kpr*.desktop
 %{_kde4_datadir}/kde4/servicetypes/kpr*.desktop
@@ -590,10 +618,8 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_configdir}/kritarc
 %{_kde4_libdir}/libkdeinit4_krita.so
 %{_kde4_libdir}/libkrita*.so.*
-%{_kde4_libdir}/libKrita*.so
-%{_kde4_libdir}/libKritaRulerAssistantCommon.so.*
 %{_kde4_libdir}/kde4/*krita*.*
-#{_kde4_libdir}/libkrossmodulekrita.so.*
+%{_kde4_libdir}/libkrossmodulekrita.so.*
 %{_kde4_appsdir}/krita/
 %{_kde4_datadir}/kde4/services/krita*.desktop
 %{_kde4_datadir}/kde4/servicetypes/krita*.desktop
@@ -668,15 +694,14 @@ update-desktop-database -q &> /dev/null 
 %files kformula
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kformula
-%{_kde4_libdir}/libkdeinit4_kformula.so
 %{_kde4_libdir}/libkformulaprivate.so.*
 %{_kde4_libdir}/kde4/*kformula*.*
 %{_kde4_libdir}/kde4/formulashape.*
 %{_kde4_appsdir}/kformula/
 %{_kde4_datadir}/kde4/services/kformula*.desktop
 %{_kde4_datadir}/applications/kde4/*kformula.desktop
-%{_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}
@@ -711,6 +736,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/libgenerickofilter.*
 %{_kde4_libdir}/kde4/libhtmlexport.*
 %{_kde4_libdir}/kde4/libhtmlimport.*
+%{_kde4_libdir}/kde4/libicalendarexport.*
 %{_kde4_libdir}/kde4/libkspreadlatexexport.*
 %{_kde4_libdir}/kde4/libkwordkword1dot3import.*
 %{_kde4_libdir}/kde4/libmswriteexport.*
@@ -719,6 +745,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/liboowriterimport.*
 %{_kde4_libdir}/kde4/libpalmdocexport.*
 %{_kde4_libdir}/kde4/libpalmdocimport.*
+%{_kde4_libdir}/kde4/libpowerpointimport.*
 %{_kde4_libdir}/kde4/librtfexport.*
 %{_kde4_libdir}/kde4/librtfimport.*
 %{_kde4_libdir}/kde4/libwmlexport.*
@@ -726,7 +753,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/libwpexport.*
 %{_kde4_libdir}/kde4/libwpimport.*
 #{_kde4_libdir}/kde4/libmswordimport.*
-%{_kde4_libdir}/kde4/libmswordodf_import.*
+#{_kde4_libdir}/kde4/libmswordodf_import.*
 %{_kde4_libdir}/kde4/libxsltimport.*
 %{_kde4_libdir}/kde4/libxsltexport.*
 %{_kde4_libdir}/kde4/libhancomwordimport.*
@@ -738,16 +765,23 @@ update-desktop-database -q &> /dev/null 
 %files kplato
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kplato
+%{_kde4_bindir}/kplatowork
 %{_kde4_configdir}/kplatorc
+%{_kde4_configdir}/kplatoworkrc
+%{_kde4_datadir}/config.kcfg/kplatosettings.kcfg
 %{_kde4_libdir}/libkdeinit4_kplato.so
 %{_kde4_libdir}/kde4/libkplatopart.*
+%{_kde4_libdir}/kde4/libkplatoworkpart.so
 %{_kde4_libdir}/libkplato*.so.*
 %{_kde4_libdir}/kde4/krossmodulekplato.so
 %{_kde4_datadir}/kde4/services/krossmodulekplato.desktop
 %{_kde4_appsdir}/kplato/
+%{_kde4_appsdir}/kplatowork/
 %{_kde4_docdir}/HTML/en/kplato/
 %{_kde4_datadir}/kde4/services/kplato*.desktop
+%{_kde4_datadir}/kde4/servicetypes/kplato*.desktop
 %{_kde4_datadir}/applications/kde4/kplato.desktop
+%{_kde4_datadir}/applications/kde4/kplatowork.desktop
 
 %files kword
 %defattr(-,root,root,-)
@@ -758,7 +792,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/krossmodulekword.so
 %{_kde4_libdir}/kde4/libkwordpart.*
 %{_kde4_appsdir}/kword/
-%{_kde4_docdir}/HTML/en/kword/
+#{_kde4_docdir}/HTML/en/kword/
 %{_kde4_datadir}/kde4/services/*kword*.desktop
 %{_kde4_datadir}/templates/TextDocument.desktop
 %{_kde4_datadir}/templates/.source/TextDocument.kwt
@@ -767,6 +801,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-1
+- koffice-2.0.81
+
 * 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.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	24 Jun 2009 12:28:14 -0000	1.31
+++ sources	26 Aug 2009 20:59:21 -0000	1.32
@@ -1 +1 @@
-86fb3660c2b87495d1bf84da9044d441  koffice-2.0.1.tar.bz2
+d880b2d479c465d3d2cde7146007afbd  koffice-2.0.81.tar.bz2

More information about the fedora-extras-commits mailing list