SPECS: openoffice.org.spec - AC-branch merge

[glen]

Author: glen                         Date: Tue Mar 13 13:03:03 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   openoffice.org.spec (1.726 -> 1.727) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.726 SPECS/openoffice.org.spec:1.727
--- SPECS/openoffice.org.spec:1.726	Sun Mar 11 17:04:58 2007
+++ SPECS/openoffice.org.spec	Tue Mar 13 14:02:55 2007
@@ -52,6 +52,11 @@
 %bcond_without	system_myspell
 %bcond_with	system_xt
 
+# this list is same as java-sun
+%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
+%undefine	with_java
+%endif
+
 %if %{without java}
 %undefine	with_system_beanshell
 %undefine	with_system_xalan
@@ -62,7 +67,7 @@
 %endif
 
 %define		ver		2.1.0
-%define		_rel		6
+%define		_rel		7
 %define		subver		680
 %define		snap		OOE680
 %define		snap2		SRC680
@@ -2339,6 +2344,8 @@
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/javascript
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xslt
 	%endif
+
+	touch installed.stamp
 fi
 
 # Find out locales
@@ -2718,16 +2725,6 @@
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/ucb/Hierarchy.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/ucb/Store.xcs
 %{_datadir}/%{name}/share/registry/ldap
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-calc.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-chart.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-draw.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-impress.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-math.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-writer.xcu
-%if %{with java}
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_ja.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_ko.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_zh-CN.xcu
@@ -2744,7 +2741,16 @@
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ta-IN.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_th.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_vi.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-korea.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-calc.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-chart.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-draw.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-impress.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-math.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-writer.xcu
 # move it to -writer ?
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ja.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ko.xcu
@@ -2835,7 +2841,6 @@
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-zh-CN.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-zh-TW.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-zu.xcu
-%endif
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_global_filters.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_base_filters.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_chart_filters.xcu
@@ -3860,6 +3865,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.727  2007/03/13 13:02:55  glen
+- AC-branch merge
+
 Revision 1.726  2007/03/11 16:04:58  glen
 - AC-branch merge: move %{name}/share to %{_datadir}, now external noarch packages possible
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.726&r2=1.727&f=u