SPECS: java-sun.spec - rel 2; move policytool and java_vm to jre-X...

[arekm]

Author: arekm                        Date: Thu Jan 11 21:53:26 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2; move policytool and java_vm to jre-X11 (these are symlinks pointing to jre-X11 stuff); drop ktab - doesn't exist

---- Files affected:
SPECS:
   java-sun.spec (1.157 -> 1.158) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.157 SPECS/java-sun.spec:1.158
--- SPECS/java-sun.spec:1.157	Thu Jan  4 10:24:27 2007
+++ SPECS/java-sun.spec	Thu Jan 11 22:53:20 2007
@@ -2,7 +2,6 @@
 # TODO:
 # - better way to choose preferred jvm (currently the symlinks are hardcoded)
 #   Maybe a package containing only the symlinks?
-# - dead symlinks in %{javadir}/bin if -jre-X11 not installed: ControlPanel, javaws, policytool
 #
 %define		_src_ver	6
 %define		_dir_ver	%(echo %{version} | sed 's/\\.\\(..\\)$/_\\1/')
@@ -10,7 +9,7 @@
 Summary(pl):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	1.6.0
-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
@@ -297,7 +296,7 @@
 
 cp -rf jre/{bin,lib} $RPM_BUILD_ROOT%{jredir}
 
-for i in ControlPanel java java_vm keytool ktab orbd policytool \
+for i in ControlPanel java java_vm keytool orbd policytool \
 	rmid rmiregistry servertool tnameserv ; do
 	ln -sf %{jredir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i
 done
@@ -310,7 +309,7 @@
 done
 
 # make sure all tools are available under $(JDK_HOME)/bin
-for i in ControlPanel keytool kinit klist ktab orbd policytool rmid \
+for i in ControlPanel keytool kinit klist orbd policytool rmid \
 		rmiregistry servertool tnameserv ; do
 	ln -sf ../jre/bin/$i $RPM_BUILD_ROOT%{javadir}/bin/$i
 done
@@ -477,7 +476,6 @@
 %attr(755,root,root) %{javadir}/bin/keytool
 %attr(755,root,root) %{javadir}/bin/native2ascii
 %attr(755,root,root) %{javadir}/bin/orbd
-%attr(755,root,root) %{javadir}/bin/policytool
 %attr(755,root,root) %{javadir}/bin/rmid
 %attr(755,root,root) %{javadir}/bin/rmiregistry
 %attr(755,root,root) %{javadir}/bin/schemagen
@@ -567,9 +565,7 @@
 %{_jvmdir}/jre
 %{_jvmjardir}/jre
 %attr(755,root,root) %{_bindir}/java
-%attr(755,root,root) %{_bindir}/java_vm
 %attr(755,root,root) %{_bindir}/keytool
-%attr(755,root,root) %{_bindir}/ktab
 %attr(755,root,root) %{_bindir}/orbd
 %attr(755,root,root) %{_bindir}/rmid
 %attr(755,root,root) %{_bindir}/servertool
@@ -583,9 +579,6 @@
 %attr(755,root,root) %{javadir}/bin/java
 %dir %{jredir}
 %dir %{jredir}/bin
-%ifarch %{ix86}
-%attr(755,root,root) %{jredir}/bin/java_vm
-%endif
 %attr(755,root,root) %{jredir}/bin/java
 %attr(755,root,root) %{jredir}/bin/keytool
 %attr(755,root,root) %{jredir}/bin/orbd
@@ -711,6 +704,7 @@
 %attr(755,root,root) %{jredir}/bin/jcontrol
 %endif
 %ifarch %{ix86}
+%attr(755,root,root) %{_bindir}/java_vm
 %attr(755,root,root) %{jredir}/bin/java_vm
 %endif
 %attr(755,root,root) %{jredir}/bin/policytool
@@ -837,6 +831,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.158  2007/01/11 21:53:20  arekm
+- rel 2; move policytool and java_vm to jre-X11 (these are symlinks pointing to jre-X11 stuff); drop ktab - doesn't exist
+
 Revision 1.157  2007/01/04 09:24:27  glen
 - add todo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/java-sun.spec?r1=1.157&r2=1.158&f=u