SPECS: java-sun.spec - rel 2; use ugly hack as workaround for non-...

[arekm]

Author: arekm                        Date: Sat Nov 24 11:19:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2; use ugly hack as workaround for non-threaded static Xinerama linked into java mawt library

---- Files affected:
SPECS:
   java-sun.spec (1.192 -> 1.193) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.192 SPECS/java-sun.spec:1.193
--- SPECS/java-sun.spec:1.192	Fri Nov  9 11:40:50 2007
+++ SPECS/java-sun.spec	Sat Nov 24 12:19:14 2007
@@ -4,7 +4,9 @@
 #   Maybe a package containing only the symlinks?
 # - 1.6.0.03 still broken and fails with libxcb enabled X11 libs:
 #   java_vm: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed.
-#   Use export LIBXCB_ALLOW_SLOPPY_LOCK=1 runtime as workaround.
+#   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	6u3
 %define		_dir_ver	%(echo %{version} | sed 's/\\.\\(..\\)$/_\\1/')
@@ -14,7 +16,7 @@
 Summary(pl.UTF-8):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	1.6.0.03
-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
@@ -393,6 +395,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
@@ -837,6 +843,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.193  2007-11-24 11:19:14  arekm
+- rel 2; use ugly hack as workaround for non-threaded static Xinerama linked into java mawt library
+
 Revision 1.192  2007-11-09 10:40:50  arekm
 - mention java lock brokeness and workaround
 
================================================================

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