SPECS (AC-branch): openoffice.org.spec - update without java files...

[glen]

Author: glen                         Date: Tue Mar 13 13:01:52 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- update without java files
- build on same archidectures as oo 1.x, but without java where java sun is not available
- rel 7

---- Files affected:
SPECS:
   openoffice.org.spec (1.704.2.29 -> 1.704.2.30) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.29 SPECS/openoffice.org.spec:1.704.2.30
--- SPECS/openoffice.org.spec:1.704.2.29	Sun Mar 11 17:22:08 2007
+++ SPECS/openoffice.org.spec	Tue Mar 13 14:01:47 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
@@ -219,8 +224,7 @@
 Requires:	%{name}-writer = %{epoch}:%{version}-%{release}
 Requires:	%{name}-xsltfilter = %{epoch}:%{version}-%{release}
 Requires:	fonts-TTF-OpenSymbol = %{epoch}:%{version}-%{release}
-# NOTE: when adding archidectures here, don't forget to update basesystem.spec
-ExclusiveArch:	i586 i686 pentium3 pentium4 athlon
+ExclusiveArch:	%{ix86} ppc sparc sparcv9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # No ELF objects there to strip/chrpath (skips processing 17k files totaling 415M)
@@ -2337,6 +2341,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
@@ -2716,16 +2722,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
@@ -2742,7 +2738,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
@@ -2833,7 +2838,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
@@ -3858,6 +3862,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.704.2.30  2007/03/13 13:01:47  glen
+- update without java files
+- build on same archidectures as oo 1.x, but without java where java sun is not available
+- rel 7
+
 Revision 1.704.2.29  2007/03/11 16:22:08  glen
 - HEAD merge:
   - Fixed updating desktop & mime database.
================================================================

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