[packages/java-sun/AC-branch] cherry-pick update to 1.6.0.45 from master
glen
glen at pld-linux.org
Fri May 31 15:21:38 CEST 2013
commit 09bf3b530b69a70d9eecb14f390c12b469221d42
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri May 31 16:21:25 2013 +0300
cherry-pick update to 1.6.0.45 from master
java-sun.spec | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/java-sun.spec b/java-sun.spec
index e191aba..2da24cf 100644
--- a/java-sun.spec
+++ b/java-sun.spec
@@ -12,15 +12,17 @@
# Conditional build:
%bcond_without tests # build without tests
-%define src_ver 6u35
-%define sub_ver b04
+# disable file duplicate packaging error
+%define _duplicate_files_terminate_build 0
+%define src_ver 6u45
+%define sub_ver b06
%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: Oracle JDK (Java Development Kit) for Linux
Summary(pl.UTF-8): Oracle JDK - środowisko programistyczne Javy dla Linuksa
Name: java-sun
-Version: 1.6.0.35
+Version: 1.6.0.45
Release: 1
License: restricted, distributable
# http://www.oracle.com/technetwork/java/javase/terms/license/index.html
@@ -30,9 +32,9 @@ Group: Development/Languages/Java
# Download URL (requires JavaScript and interactive license agreement):
# http://www.oracle.com/technetwork/java/javase/downloads/index.html
Source0: http://download.oracle.com/otn-pub/java/jdk/%{src_ver}-%{sub_ver}/jdk-%{src_ver}-linux-i586.bin
-# Source0-md5: 592b60fcc11cbd6d323a3f357327d701
+# Source0-md5: 3269370b7c34e6cbfed8785d3d0c5cbd
Source1: http://download.oracle.com/otn-pub/java/jdk/%{src_ver}-%{sub_ver}/jdk-%{src_ver}-linux-x64.bin
-# Source1-md5: 3876e012629977ce08054347cf3bfdb0
+# Source1-md5: 40c1a87563c5c6a90a0ed6994615befe
Source2: Test.java
Source3: Test.class
Patch0: %{name}-desktop.patch
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/java-sun.git/commitdiff/09bf3b530b69a70d9eecb14f390c12b469221d42
More information about the pld-cvs-commit
mailing list