rpms/openoffice.org/devel openoffice.org.spec,1.546,1.547

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
split some language dependant stuff into the appropiate langpacks


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -r1.546 -r1.547
--- openoffice.org.spec	14 Nov 2005 16:25:26 -0000	1.546
+++ openoffice.org.spec	14 Nov 2005 17:53:39 -0000	1.547
@@ -15,12 +15,12 @@
 %define usegcc3 1
 %define rh_rpm_extension 0
 %define internalxmlsec 1
-%define internalicu 0
-%define internaljavabits 0
+%define internalicu 1
+%define internaljavabits 1
 %define includeemailmerge 1
 %define cripplemenus 1
 %define seperatebase 1
-%define gnomeprintui 1
+%define gnomeprintui 0
 %define galangpack 1
 %endif
 %if %{build_fc4}
@@ -1215,6 +1215,9 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ar.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ar.xcu
 
 %files langpack-bg_BG
 %defattr(-,root,root)
@@ -1559,6 +1562,9 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-gu-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_gu-IN.xcu
 
 %files langpack-pa_IN
 %defattr(-,root,root)
@@ -1577,6 +1583,9 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-pa-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_pa-IN.xcu
 
 %files langpack-he_IL
 %defattr(-,root,root)
@@ -1598,6 +1607,9 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-he.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_he.xcu
 
 %files langpack-hi_IN
 %defattr(-,root,root)
@@ -1616,6 +1628,9 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-hi-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_hi-IN.xcu
 
 %files langpack-hu_HU
 %defattr(-,root,root)
@@ -1705,6 +1720,11 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ja.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_ja.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ja.xcu
 
 %files langpack-ko_KR
 %defattr(-,root,root)
@@ -1725,6 +1745,12 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ko.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_ko.xcu
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-korea.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ko.xcu
 
 %files langpack-lt_LT
 %defattr(-,root,root)
@@ -2011,6 +2037,9 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ta-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ta-IN.xcu
 
 %files langpack-th_TH
 %defattr(-,root,root)
@@ -2032,6 +2061,9 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-th.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_th.xcu
 
 %files langpack-tr_TR
 %defattr(-,root,root)
@@ -2072,6 +2104,11 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-zh-CN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_zh-CN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-CN.xcu
 
 %files langpack-zh_TW
 %defattr(-,root,root)
@@ -2092,6 +2129,11 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-zh-TW.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_zh-TW.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-TW.xcu
 
 %files langpack-zu_ZA
 %defattr(-,root,root)
@@ -2614,9 +2656,6 @@
 %dir %{instdir}/share/registry/modules/org/openoffice/Office
 %{instdir}/share/registry/modules/org/openoffice/Office/Embedding
 %dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/*cjk*
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/*ctl*
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-korea.xcu
 %{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-en-US.xcu
@@ -2993,11 +3032,6 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-writer.xcu
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Setup-writer.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ja.xcu
-%{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
 %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