[packages/icedtea7: 15/103] - javaws is not installed on x86_64

[jajcus]

commit e2451a3e3da7320395aa563cb751bf610e960d07
Author: Jacek Konieczny <jajcus at pld-linux.org>
Date:   Thu Apr 15 12:19:21 2010 +0000

    - javaws is not installed on x86_64
    
    Changed files:
        TODO -> 1.3
        icedtea6.spec -> 1.15

 TODO          |  4 +++-
 icedtea6.spec | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index 115927d..81a7e30 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -424,7 +424,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dstdir}/bin/javadoc
 %attr(755,root,root) %{dstdir}/bin/javah
 %attr(755,root,root) %{dstdir}/bin/javap
+%ifnarch x86_64
 %attr(755,root,root) %{dstdir}/bin/javaws
+%endif
 %attr(755,root,root) %{dstdir}/bin/jconsole
 %attr(755,root,root) %{dstdir}/bin/jdb
 %attr(755,root,root) %{dstdir}/bin/jhat
@@ -466,7 +468,9 @@ rm -rf $RPM_BUILD_ROOT
 %files jre
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/java
+%ifnarch x86_64
 %attr(755,root,root) %{_bindir}/javaws
+%endif
 %attr(755,root,root) %{_bindir}/keytool
 %attr(755,root,root) %{_bindir}/orbd
 %attr(755,root,root) %{_bindir}/pack200
@@ -477,7 +481,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/tnameserv
 %attr(755,root,root) %{_bindir}/unpack200
 %{_mandir}/man1/java.*
+%ifnarch x86_64
 %{_mandir}/man1/javaws.*
+%endif
 %{_mandir}/man1/keytool.*
 %{_mandir}/man1/orbd.*
 %{_mandir}/man1/pack200.*
@@ -488,7 +494,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/tnameserv.*
 %{_mandir}/man1/unpack200.*
 %lang(ja) %{_mandir}/ja/man1/java.*
+%ifnarch x86_64
 %lang(ja) %{_mandir}/ja/man1/javaws.*
+%endif
 %lang(ja) %{_mandir}/ja/man1/keytool.*
 %lang(ja) %{_mandir}/ja/man1/orbd.*
 %lang(ja) %{_mandir}/ja/man1/pack200.*
@@ -508,7 +516,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_jvmdir}/%{name}-jre
 %dir %{jredir}/bin
 %attr(755,root,root) %{jredir}/bin/java
+%ifnarch x86_64
 %attr(755,root,root) %{jredir}/bin/javaws
+%endif
 %attr(755,root,root) %{jredir}/bin/keytool
 %attr(755,root,root) %{jredir}/bin/orbd
 %attr(755,root,root) %{jredir}/bin/pack200
diff --git a/TODO b/TODO
index ad01690..d29cc25 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,6 @@
 - better descriptions
 - Polish descriptions for subpackages
 - browser plugin
-- check and improve jre Provides (though the APIs should be java-* or java(*), not like in current java-sun-jre)
+- Java WebStart on x86_64
+- check and improve jre Provides (though the APIs should be java-* or java(*),
+  not like in current java-sun-jre)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf