SPECS: java-sun.spec - rel 2; hack is back, xcb issue not fixed (s...

[arekm]

Author: arekm                        Date: Mon Jan 21 22:00:24 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2; hack is back, xcb issue not fixed (see bugreport)

---- Files affected:
SPECS:
   java-sun.spec (1.200 -> 1.201) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.200 SPECS/java-sun.spec:1.201
--- SPECS/java-sun.spec:1.200	Mon Jan 21 20:50:48 2008
+++ SPECS/java-sun.spec	Mon Jan 21 23:00:19 2008
@@ -2,6 +2,11 @@
 # TODO:
 # - better way to choose preferred jvm (currently the symlinks are hardcoded)
 #   Maybe a package containing only the symlinks?
+# - 1.6.0.04 still broken and fails with libxcb enabled X11 libs:
+#   java_vm: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed.
+#   There are two ways to workaround this: 1) use export LIBXCB_ALLOW_SLOPPY_LOCK=1
+#   runtime or 2) prevent java from finding Xinerama extension. For now we do ugly 2).
+#   See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6532373 for details.
 #
 %define		_src_ver	6u4
 %define		_dir_ver	%(echo %{version} | sed 's/\\.\\(..\\)$/_\\1/')
@@ -11,7 +16,7 @@
 Summary(pl.UTF-8):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	1.6.0.04
-Release:	1
+Release:	2
 License:	restricted, distributable
 Group:		Development/Languages/Java
 Source0:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin
@@ -401,6 +406,10 @@
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_jvmjardir}/jre
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_jvmjardir}/jsse
 
+# UGLY HACK UGLY HACK
+# Prevent java from finding Xinerama extension. See TODO at beginning of this spec.
+find $RPM_BUILD_ROOT -name 'libmawt.so' -exec sed -i 's/XINERAMA/FAKEEXTN/g' "{}" ";"
+
 # modify RPATH so that javac and friends are able to work when /proc is not
 # mounted and we can't append to RPATH (for example to keep previous lookup
 # path) as RPATH can't be longer than original
@@ -845,6 +854,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.201  2008-01-21 22:00:19  arekm
+- rel 2; hack is back, xcb issue not fixed (see bugreport)
+
 Revision 1.200  2008-01-21 19:50:48  arekm
 - up to 1.6.0.04 (xcb problem is supposed to be fixed in this version)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-sun.spec?r1=1.200&r2=1.201&f=u