SPECS: java-sun.spec - up to 1.6.0.04 (xcb problem is supposed to ...

[arekm]

Author: arekm                        Date: Mon Jan 21 19:50:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.6.0.04 (xcb problem is supposed to be fixed in this version)

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

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.199 SPECS/java-sun.spec:1.200
--- SPECS/java-sun.spec:1.199	Tue Dec 25 21:52:17 2007
+++ SPECS/java-sun.spec	Mon Jan 21 20:50:48 2008
@@ -2,27 +2,22 @@
 # TODO:
 # - better way to choose preferred jvm (currently the symlinks are hardcoded)
 #   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.
-#   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		_src_ver	6u4
 %define		_dir_ver	%(echo %{version} | sed 's/\\.\\(..\\)$/_\\1/')
 # class data version seen with file(1) that this jvm is able to load
 %define		_classdataversion 50.0
 Summary:	Sun JDK (Java Development Kit) for Linux
 Summary(pl.UTF-8):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
-Version:	1.6.0.03
-Release:	7
+Version:	1.6.0.04
+Release:	1
 License:	restricted, distributable
 Group:		Development/Languages/Java
 Source0:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin
-# Source0-md5:	e39a322d8e3c89d3e679047cdeab50f7
+# Source0-md5:	d5bba61ea1e0b76090b855ff49ec1d6a
 Source1:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-amd64.bin
-# Source1-md5:	f0bf3837b2ba7965ad932e06321a172e
+# Source1-md5:	f64a636c6e516992fd1840c5b2419b53
 Source2:	Test.java
 Patch0:		%{name}-desktop.patch
 URL:		https://jdk-distros.dev.java.net/developer.html
@@ -318,7 +313,10 @@
 
 cp -af jre/{bin,lib} $RPM_BUILD_ROOT%{jredir}
 
-for i in java javaws java_vm keytool orbd policytool \
+for i in java keytool orbd policytool \
+%ifarch %{ix86}
+	java_vm javaws \
+%endif
 	rmid rmiregistry servertool tnameserv pack200 unpack200; do
 	[ -f $RPM_BUILD_ROOT%{jredir}/bin/$i ] || exit 1
 	ln -sf %{jredir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i
@@ -339,13 +337,16 @@
 %endif
 
 # make sure all tools are available under $(JDK_HOME)/bin
-for i in keytool orbd policytool rmid java_vm \
-		rmiregistry servertool tnameserv pack200 unpack200 java javaws; do
+for i in keytool orbd policytool rmid \
+%ifarch %{ix86}
+		java_vm javaws \
+%endif
+		rmiregistry servertool tnameserv pack200 unpack200 java; do
 	[ -f $RPM_BUILD_ROOT%{jredir}/bin/$i ] || exit 1
 	ln -sf ../jre/bin/$i $RPM_BUILD_ROOT%{javadir}/bin/$i
 done
 
-%ifarch %{x8664}
+%ifnarch %{ix86}
 # only manual available on this platform
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/javaws.1
 %endif
@@ -400,10 +401,6 @@
 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
@@ -771,6 +768,7 @@
 %lang(zh_CN) %{jredir}/lib/locale/zh
 %lang(zh_CN) %{jredir}/lib/locale/zh.*
 %lang(zh_HK) %{jredir}/lib/locale/zh_HK*
+%lang(zh_HK) %{_datadir}/locale/zh_HK/LC_MESSAGES/sunw_java_plugin.mo
 %lang(zh_TW) %{jredir}/lib/locale/zh_TW*
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/sunw_java_plugin.mo
 %lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
@@ -847,6 +845,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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)
+
 Revision 1.199  2007-12-25 20:52:17  glen
 - moved control panel desktop file to -jre-X11
 - cleanups, cosmetics, check created symlinks; rel 7
================================================================

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