SPECS (AC-branch): openoffice.org.spec - fix for archidectures wit...

[glen]

Author: glen                         Date: Tue Mar 20 17:46:30 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- fix for archidectures without java; rel 2

---- Files affected:
SPECS:
   openoffice.org.spec (1.704.2.45 -> 1.704.2.46) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.45 SPECS/openoffice.org.spec:1.704.2.46
--- SPECS/openoffice.org.spec:1.704.2.45	Tue Mar 20 16:41:07 2007
+++ SPECS/openoffice.org.spec	Tue Mar 20 18:46:25 2007
@@ -69,7 +69,7 @@
 %undefine	with_system_hsqldb
 %endif
 
-%define		_rel		1
+%define		_rel		2
 %define		upd			680
 %define		mws			OOE%{upd}
 %define		tag			%(echo %{mws} | tr A-Z a-z)-%{milestone}
@@ -2377,8 +2377,10 @@
 	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}
@@ -2489,7 +2491,7 @@
 	rmdir %{_libdir}/%{name}/share/dict/ooo 2>/dev/null || mv -v %{_libdir}/%{name}/share/dict/ooo{,.rpmsave} || :
 fi
 %endif
-for d in presets share help readmes licenses; do
+for d in presets share %{?with_java:help} readmes licenses; do
 	if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
 		install -d %{_datadir}/%{name}
 		mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d || mv %{_libdir}/%{name}/$d{,.rpmsave}
@@ -3936,6 +3938,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.704.2.46  2007/03/20 17:46:25  glen
+- fix for archidectures without java; rel 2
+
 Revision 1.704.2.45  2007/03/20 15:41:07  glen
 - no need for rel up as build will most likely still succeed
 
================================================================

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