Merge branch 'master' of git://git.pld-linux.org/packages/java-sun

diff --combined java-sun.spec
index 50cefd2a9924952ea0ce52966cc8d536b015009f,ba2a514cfb276924eb11a4cf6576e07533c6c19f..fea45f127a677343a74d83783c884b10d84b841c
--- 1/java-sun.spec
--- 2/java-sun.spec
+++ b/java-sun.spec
@@@ -12,8 -12,6 +12,8 @@@
  # Conditional build:
  %bcond_without        tests           # build without tests
  
 +# disable file duplicate packaging error
 +%define               _duplicate_files_terminate_build   0
  %define               src_ver 6u37
  %define               sub_ver b06
  %define               dir_ver %(echo %{version} | sed 's/\\.\\(..\\)$/_\\1/')
@@@ -23,7 -21,7 +23,7 @@@ Summary:      Oracle JDK (Java Development K
  Summary(pl.UTF-8):    Oracle JDK - środowisko programistyczne Javy dla Linuksa
  Name:         java-sun
  Version:      1.6.0.37
 -Release:      1
 +Release:      2
  License:      restricted, distributable
  # http://www.oracle.com/technetwork/java/javase/terms/license/index.html
  # See "LICENSE TO DISTRIBUTE SOFTWARE" section, which states you can
@@@ -31,9 -29,9 +31,9 @@@
  Group:                Development/Languages/Java
  # Download URL (requires JavaScript and interactive license agreement):
  # http://www.oracle.com/technetwork/java/javase/downloads/index.html
- Source0:      jdk-%{src_ver}-linux-i586.bin
+ Source0:      http://download.oracle.com/otn-pub/java/jdk/%{src_ver}-%{sub_ver}/jdk-%{src_ver}-linux-i586.bin
  # Source0-md5:        a7a3d53b10f8bb1fb598dd7d936ecb1d
- Source1:      jdk-%{src_ver}-linux-x64.bin
+ Source1:      http://download.oracle.com/otn-pub/java/jdk/%{src_ver}-%{sub_ver}/jdk-%{src_ver}-linux-x64.bin
  # Source1-md5:        82616ae15ca93ccccb37bef3618ecdec
  Source2:      Test.java
  Source3:      Test.class