SPECS: openoffice.org.spec - fix non-java builds; should fix ppc and i486 t...

[arekm]

Author: arekm                        Date: Tue Jul 29 18:56:03 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix non-java builds; should fix ppc and i486 th build

---- Files affected:
SPECS:
   openoffice.org.spec (1.795 -> 1.796) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.795 SPECS/openoffice.org.spec:1.796
--- SPECS/openoffice.org.spec:1.795	Thu Jul 24 14:32:19 2008
+++ SPECS/openoffice.org.spec	Tue Jul 29 20:55:57 2008
@@ -2487,10 +2487,8 @@
 	mv $RPM_BUILD_ROOT%{_libdir}/%{name}/share $RPM_BUILD_ROOT%{_datadir}/%{name}
 	ln -s ../../share/%{name}/share $RPM_BUILD_ROOT%{_libdir}/%{name}/share
 	# more non-archidecture dependant nature data
-	%if %{with java}
 	mv $RPM_BUILD_ROOT%{_libdir}/%{name}/help $RPM_BUILD_ROOT%{_datadir}/%{name}
 	ln -s ../../share/%{name}/help $RPM_BUILD_ROOT%{_libdir}/%{name}/help
-	%endif
 	mv $RPM_BUILD_ROOT%{_libdir}/%{name}/licenses $RPM_BUILD_ROOT%{_datadir}/%{name}
 	ln -s ../../share/%{name}/licenses $RPM_BUILD_ROOT%{_libdir}/%{name}/licenses
 	mv $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -2713,7 +2711,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/liblpsolve*.so
 #%attr(755,root,root) %{_libdir}/%{name}/program/libmtfrenderer.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/liboox680*.so
-%ifnarch ppc
+%if %{with java}
 %attr(755,root,root) %{_libdir}/%{name}/program/librpt680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/librptui680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/librptxml680*.so
@@ -2737,7 +2735,7 @@
 %{_libdir}/%{name}/program/root5.dat
 %{_libdir}/%{name}/program/resource/acc680en-US.res
 %{_libdir}/%{name}/program/resource/chartcontroller680en-US.res
-%ifnarch ppc
+%if %{with java}
 %{_libdir}/%{name}/program/resource/rpt680en-US.res
 %{_libdir}/%{name}/program/resource/rptui680en-US.res
 %endif
@@ -3200,7 +3198,6 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/libcli_uno_glue.so
 %endif
 
-%if %{with java}
 %{_libdir}/%{name}/help
 %dir %{_datadir}/%{name}/help
 %dir %{_datadir}/%{name}/help/en
@@ -3211,6 +3208,7 @@
 %{_datadir}/%{name}/help/en/shared.*
 %{_datadir}/%{name}/help/*.xsl
 
+%if %{with java}
 %attr(755,root,root) %{_libdir}/%{name}/program/javaldx
 %attr(755,root,root) %{_libdir}/%{name}/program/java-set-classpath
 %{_libdir}/%{name}/program/jvmfwk3rc
@@ -3664,14 +3662,12 @@
 %{_iconsdir}/hicolor/*/apps/ooo-base.png
 %{_pixmapsdir}/ooo-base.png
 %{_libdir}/%{name}/program/resource/cnr680en-US.res
-%if %{with java}
 %{_datadir}/%{name}/help/en/sdatabase.*
-%endif
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbapp
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbbrowser
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbquery
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbrelation
-%ifnarch ppc
+%if %{with java}
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbreport
 %endif
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbtable
@@ -3700,9 +3696,7 @@
 %{_desktopdir}/oocalc.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-calc.png
 %{_pixmapsdir}/ooo-calc.png
-%if %{with java}
 %{_datadir}/%{name}/help/en/scalc.*
-%endif
 %{_libdir}/%{name}/program/resource/analysis680en-US.res
 %{_libdir}/%{name}/program/resource/bf_sc680en-US.res
 %{_libdir}/%{name}/program/resource/date680en-US.res
@@ -3726,9 +3720,7 @@
 %{_desktopdir}/oodraw.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-draw.png
 %{_pixmapsdir}/ooo-draw.png
-%if %{with java}
 %{_datadir}/%{name}/help/en/sdraw.*
-%endif
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-draw.xcu
@@ -3754,8 +3746,8 @@
 %{_desktopdir}/oowriter.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-writer.png
 %{_pixmapsdir}/ooo-writer.png
-%if %{with java}
 %{_datadir}/%{name}/help/en/swriter.*
+%if %{with java}
 %{_libdir}/%{name}/program/classes/writer2latex.jar
 %endif
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swriter
@@ -3787,9 +3779,7 @@
 %{_desktopdir}/ooimpress.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-impress.png
 %{_pixmapsdir}/ooo-impress.png
-%if %{with java}
 %{_datadir}/%{name}/help/en/simpress.*
-%endif
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/simpress
 %{_datadir}/%{name}/share/config/soffice.cfg/simpress/
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/Effects.xcu
@@ -3811,9 +3801,7 @@
 %{_desktopdir}/oomath.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-math.png
 %{_pixmapsdir}/ooo-math.png
-%if %{with java}
 %{_datadir}/%{name}/help/en/smath.*
-%endif
 %{_libdir}/%{name}/program/resource/bf_sm680en-US.res
 %{_libdir}/%{name}/program/resource/sm680en-US.res
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/smath
@@ -4196,6 +4184,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.796  2008/07/29 18:55:57  arekm
+- fix non-java builds; should fix ppc and i486 th build
+
 Revision 1.795  2008/07/24 12:32:19  arekm
 - rel 0.2; disable diskspace() br
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org.spec?r1=1.795&r2=1.796&f=u