SPECS: openoffice.org.spec - BC: java-sun-1.4.2 removed - added TO...

[sls]

Author: sls                          Date: Mon Jan  8 19:06:23 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BC: java-sun-1.4.2 removed
- added TODO entries about java

---- Files affected:
SPECS:
   openoffice.org.spec (1.686 -> 1.687) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.686 SPECS/openoffice.org.spec:1.687
--- SPECS/openoffice.org.spec:1.686	Sun Jan  7 20:32:23 2007
+++ SPECS/openoffice.org.spec	Mon Jan  8 20:06:18 2007
@@ -11,6 +11,8 @@
 #	- LFS support is disabled (no_lfs_hack.patch for xml2cmp crash) because it need LFS-ready STLport
 #       - bcond with_mono is broken (cli_types.dll not found, and can't be made)
 #	- build on 64-bit architectures
+#	- doesn't build with java-sun-1.6 (maybe java-dependent packages are screwed)
+#	- maybe it could be build with gcc-java
 #       - adapt help-support.diff to PLD
 #	- make --without xvfb working, required
 #	  REMOVE USE of Xvfb from build-galleries script (ooo-build-2.0.1.2/bin/build-galleries line 84)
@@ -215,7 +217,6 @@
 BuildRequires:	mozilla-firefox-devel
 %endif
 BuildConflicts:	STLport4
-BuildConflicts:	java-sun = 1.4.2
 Requires:	%{name}-base = %{epoch}:%{version}-%{release}
 Requires:	%{name}-calc = %{epoch}:%{version}-%{release}
 Requires:	%{name}-draw = %{epoch}:%{version}-%{release}
@@ -3761,6 +3762,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.687  2007/01/08 19:06:18  sls
+- BC: java-sun-1.4.2 removed
+- added TODO entries about java
+
 Revision 1.686  2007/01/07 19:32:23  qboosh
 - use gnomevfs bcond for its files
 
================================================================

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