rpms/openoffice.org/devel openoffice.org.spec,1.316,1.317

[fedora-cvs-commits redhat com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17971

Modified Files:
	openoffice.org.spec 
Log Message:
split out email mailmerge


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- openoffice.org.spec	16 Jul 2005 10:29:01 -0000	1.316
+++ openoffice.org.spec	16 Jul 2005 10:52:06 -0000	1.317
@@ -16,11 +16,13 @@
 %define release_extension .1.0.fc4
 %define internalxmlsec 1
 %define internaldb 1
+%define includeemailmerge 0
 %endif
 %if %{build_fc5}
 %define release_extension .2.0.fc5
 %define internalxmlsec 0
 %define internaldb 1
+%define includeemailmerge 1
 %endif
 
 %if %{usegcc3}
@@ -223,14 +225,23 @@
 Group: Applications/Productivity
 Obsoletes: openoffice.org
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#%if %{build_fc5}
-#Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
-#%endif
 Requires: libwpd >= 0.8.0
 
 %description writer
 wordprocessor application of %{name}
 
+%if %{includeemailmerge}
+%package emailmerge
+Summary: email mail merge component for %{name}
+Group: Applications/Productivity
+Obsoletes: openoffice.org
+Requires: %{name}-writer = %{epoch}:%{version}-%{release}
+Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
+
+%description emailmerge
+enables %{name} writer module to enable mail merge to email
+%endif
+
 %package calc
 Summary: calc module for %{name}
 Obsoletes: openoffice.org
@@ -780,7 +791,9 @@
 %patch46 -p1 -b .ooo51718.rpath.patch
 %patch47 -p1 -b .rh161886.rpath.desktop.patch
 %patch48 -p1 -b .ooo51637.solenv.pyuno.patch
+%if %{includeemailmerge}
 %patch49 -p1 -b .ooo51638.mailmerge.patch
+%endif
 %patch50 -p1 -b .oooXXXXX.nostlport.patch
 %patch51 -p1 -b .ooo51673.printing.checkerror.patch
 %patch52 -p1 -b .ooo51735.audio.withoutnas.patch
@@ -2705,6 +2718,22 @@
 %postun draw
 update-desktop-database -q %{_datadir}/applications
 
+%if %{includeemailmerge}
+%files emailmerge
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/program
+%{instdir}/program/mailmerge.py*
+%dir %{instdir}/share
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
+%endif
+
 %files writer
 %defattr(-,root,root)
 %dir %{instdir}
@@ -2742,7 +2771,6 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ko.xcu
 %{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-CN.xcu
 %{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-TW.xcu
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
 %dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
 %dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
 %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_global_filters.xcu
@@ -2962,7 +2990,6 @@
 %dir %{instdir}
 %dir %{instdir}/program
 %{instdir}/program/libpyuno.so
-%{instdir}/program/mailmerge.py*
 %{instdir}/program/pythonloader.py*
 %{instdir}/program/pythonloader.uno.so
 %{instdir}/program/pythonloader.unorc
@@ -2987,6 +3014,8 @@
   fix evoab2
 - add openoffice.org-1.9.117.ooo52048.inhalt.sw.patch as minor .doc
   export regression fix for rh#158252#
+- split email mailmerge stuff into a subpackage to avoid python
+  dependancy on writer
 
 * Wed Jul 13 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.117-1
 - bump to next version and drop the integrated (finally) fpicker patch