SPECS: java-sun.spec - reorder more files to fix symlink pointing ...

[arekm]

Author: arekm                        Date: Thu Jan 11 23:30:56 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- reorder more files to fix symlink pointing to nowhere

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

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.158 SPECS/java-sun.spec:1.159
--- SPECS/java-sun.spec:1.158	Thu Jan 11 22:53:20 2007
+++ SPECS/java-sun.spec	Fri Jan 12 00:30:50 2007
@@ -14,8 +14,6 @@
 Group:		Development/Languages/Java
 Source0:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin
 # Source0-md5:	f4481c4e064cec06a65d7751d9105c6d
-Source1:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-amd64.bin
-# Source1-md5:	2e0c075c27b09aed67f99475c3a19f83
 Patch0:		%{name}-desktop.patch
 URL:		http://java.sun.com/linux/
 BuildRequires:	rpm-build >= 4.3-0.20040107.21
@@ -296,7 +294,7 @@
 
 cp -rf jre/{bin,lib} $RPM_BUILD_ROOT%{jredir}
 
-for i in ControlPanel java java_vm keytool orbd policytool \
+for i in ControlPanel java javaws java_vm keytool orbd policytool \
 	rmid rmiregistry servertool tnameserv ; do
 	ln -sf %{jredir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i
 done
@@ -340,7 +338,7 @@
 	ln -sf %{jredir}/lib/rt.jar $RPM_BUILD_ROOT%{jvmjardir}/$f.jar
 done
 
-%ifnarch %{x8664}
+%ifarch %{ix86}
 install -d $RPM_BUILD_ROOT%{jredir}/javaws
 cp -a jre/javaws/* $RPM_BUILD_ROOT%{jredir}/javaws
 ln -sf %{jredir}/lib/javaws.jar $RPM_BUILD_ROOT%{jvmjardir}/javaws.jar
@@ -449,9 +447,7 @@
 %attr(755,root,root) %{_bindir}/xjc
 %ifarch %{ix86}
 %attr(755,root,root) %{javadir}/bin/HtmlConverter
-%attr(755,root,root) %{javadir}/bin/ControlPanel
 %attr(755,root,root) %{javadir}/bin/java-rmi.cgi
-%attr(755,root,root) %{javadir}/bin/javaws
 %attr(755,root,root) %{javadir}/bin/jcontrol
 %endif
 %attr(755,root,root) %{javadir}/bin/apt
@@ -676,7 +672,6 @@
 %{_desktopdir}/sun_java.desktop
 %{_pixmapsdir}/sun_java.png
 %endif
-%{_mandir}/man1/javaws.1*
 %{_mandir}/man1/keytool.1*
 %{_mandir}/man1/orbd.1*
 %{_mandir}/man1/rmid.1*
@@ -696,17 +691,16 @@
 %ifarch %{ix86}
 %doc jre/Xusage*
 %attr(755,root,root) %{_bindir}/ControlPanel
-%endif
-%attr(755,root,root) %{_bindir}/policytool
-%ifarch %{ix86}
+%attr(755,root,root) %{_bindir}/javaws
 %attr(755,root,root) %{jredir}/bin/javaws
 %attr(755,root,root) %{jredir}/bin/ControlPanel
 %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
+%attr(755,root,root) %{javadir}/bin/ControlPanel
+%attr(755,root,root) %{javadir}/bin/javaws
 %endif
+%attr(755,root,root) %{_bindir}/policytool
 %attr(755,root,root) %{jredir}/bin/policytool
 %{jredir}/lib/fonts
 %{jredir}/lib/oblique-fonts
@@ -755,6 +749,7 @@
 %endif
 %{_mandir}/man1/policytool.1*
 %ifarch %{ix86}
+%{_mandir}/man1/javaws.1*
 %lang(ja) %{_mandir}/ja/man1/javaws.1*
 %endif
 %lang(ja) %{_mandir}/ja/man1/policytool.1*
@@ -831,6 +826,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.159  2007/01/11 23:30:50  arekm
+- reorder more files to fix symlink pointing to nowhere
+
 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
 
================================================================

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