SPECS (AC-branch): openoffice.org.spec - HEAD merge

[glen]

Author: glen                         Date: Fri Mar 16 17:59:08 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge

---- Files affected:
SPECS:
   openoffice.org.spec (1.704.2.32 -> 1.704.2.33) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.32 SPECS/openoffice.org.spec:1.704.2.33
--- SPECS/openoffice.org.spec:1.704.2.32	Fri Mar 16 02:53:33 2007
+++ SPECS/openoffice.org.spec	Fri Mar 16 18:59:02 2007
@@ -216,7 +216,7 @@
 Requires:	%{name}-emailmerge = %{epoch}:%{version}-%{release}
 Requires:	%{name}-graphicfilter = %{epoch}:%{version}-%{release}
 Requires:	%{name}-impress = %{epoch}:%{version}-%{release}
-Requires:	%{name}-javafilter = %{epoch}:%{version}-%{release}
+%{?with_java:Requires:	%{name}-javafilter = %{epoch}:%{version}-%{release}}
 Requires:	%{name}-math = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pyuno = %{epoch}:%{version}-%{release}
 Requires:	%{name}-testtools = %{epoch}:%{version}-%{release}
@@ -3875,6 +3875,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.704.2.33  2007/03/16 17:59:02  glen
+- HEAD merge
+
 Revision 1.704.2.32  2007/03/16 01:53:33  glen
 - newlines do bad in distro-config
 
================================================================

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