SPECS: koffice.spec - fix second error (kword depended on kspread)...

[djurban]

Author: djurban                      Date: Mon Sep 12 00:10:43 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix second error (kword depended on kspread) by ordering the kwmailmerge backends, 
  dont know if it builds now

---- Files affected:
SPECS:
   koffice.spec (1.123 -> 1.124) 

---- Diffs:

================================================================
Index: SPECS/koffice.spec
diff -u SPECS/koffice.spec:1.123 SPECS/koffice.spec:1.124
--- SPECS/koffice.spec:1.123	Mon Sep 12 01:54:26 2005
+++ SPECS/koffice.spec	Mon Sep 12 02:10:38 2005
@@ -744,9 +744,12 @@
 %attr(755,root,root) %{_libdir}/kde3/libqproimport.so
 %{_libdir}/kde3/libopencalc*port.la
 %attr(755,root,root) %{_libdir}/kde3/libopencalc*port.so
+%{_libdir}/kde3/kwmailmerge_kspread.la
+%attr(755,root,root) %{_libdir}/kde3/kwmailmerge_kspread.so
 %{_datadir}/apps/kspread
 %{_datadir}/apps/konqueror/servicemenus/kspread_konqi.desktop
 %{_datadir}/services/kspread*.desktop
+%{_datadir}/services/kwmailmerge_kspread.desktop
 # file below should be uncommented
 #%{_datadir}/templates/.source/SpreadSheet.ksp
 %{_datadir}/templates/SpreadSheet.desktop
@@ -783,16 +786,12 @@
 %attr(755,root,root) %{_bindir}/kword
 %{_libdir}/libkdeinit_kword.la
 %attr(755,root,root) %{_libdir}/libkdeinit_kword.so
-%{_libdir}/libkwmailmerge*.la
-%attr(755,root,root) %{_libdir}/libkwmailmerge*.so
 %{_libdir}/libkword*export*.la
 %attr(755,root,root) %{_libdir}/libkword*export*.so
 %{_libdir}/libkdeinit_kthesaurus.la
 %attr(755,root,root) %{_libdir}/libkdeinit_kthesaurus.so
 %{_libdir}/kde3/kthesaurus.la
 %attr(755,root,root) %{_libdir}/kde3/kthesaurus.so
-%{_libdir}/kde3/kwmailmerge*.la
-%attr(755,root,root) %{_libdir}/kde3/kwmailmerge*.so
 %{_libdir}/kde3/kword.la
 %attr(755,root,root) %{_libdir}/kde3/kword.so
 %{_libdir}/kde3/libabiword*port.la
@@ -827,14 +826,21 @@
 %attr(755,root,root) %{_libdir}/kde3/libkword*.so
 %{_libdir}/kde3/liboowriter*port.la
 %attr(755,root,root) %{_libdir}/kde3/liboowriter*port.so
+%{_libdir}/kde3/kwmailmerge_classic.la
+%attr(755,root,root) %{_libdir}/kde3/kwmailmerge_classic.so
+%{_libdir}/kde3/kwmailmerge_kabc.la
+%attr(755,root,root) %{_libdir}/kde3/kwmailmerge_kabc.so
+%{_libdir}/kde3/kwmailmerge_qtsqldb*.la
+%attr(755,root,root) %{_libdir}/kde3/kwmailmerge_qtsqldb*.so
 %{_datadir}/apps/kword
 %{_datadir}/apps/thesaurus
 %{_datadir}/apps/xsltfilter/export/kword/xslfo/*.xsl
 %{_datadir}/apps/konqueror/servicemenus/kword_konqi.desktop
 %{_datadir}/services/kword*.desktop
-%{_datadir}/services/kwserialletter*
 %{_datadir}/services/thesaurustool.desktop
-%{_datadir}/services/kwmailmerge*.desktop
+%{_datadir}/services/kwmailmerge_kabc.desktop
+#this is the mailmerge service info for qtsqldb and classic
+%{_datadir}/services/kwserialletter*
 %{_datadir}/templates/.source/TextDocument.kwt
 %{_datadir}/templates/TextDocument.desktop
 %{_desktopdir}/kde/KThesaurus.desktop
@@ -849,6 +855,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2005/09/12 00:10:38  djurban
+- fix second error (kword depended on kspread) by ordering the kwmailmerge backends,
+  dont know if it builds now
+
 Revision 1.123  2005/09/11 23:54:26  djurban
 - read apidocs package, no idea why apidocs should be in devel
 - make common not dependant on kexi, fixes firs error reported on maillists
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/koffice.spec?r1=1.123&r2=1.124&f=u