From b22b3ce9977a78b0d5b4bda391be75ae2b528d29 Mon Sep 17 00:00:00 2001
From: Greg Armendariz <greg.armendariz@raytheon.com>
Date: Wed, 23 Jul 2014 14:17:21 -0500
Subject: [PATCH] Omaha #3417 - Update Linux Java to v1.7.0_65

Change-Id: Ib6ea40b5ee4e20f419aae32edcc951470a935311

Former-commit-id: 58e1da93613dbe500128f4b14f60dfe4ca40f9dc [formerly 83e2b2c4c4f02112d41d8fffdddc77b66c831f02] [formerly b41ff3e082e92bb603bee2994608b1f96147367b [formerly 2a8b1ed12d9e1fe7132105bd7cc6cd8405dcd46d]]
Former-commit-id: b41ff3e082e92bb603bee2994608b1f96147367b
Former-commit-id: 4cfa594750cb404bb5eaa0db834b82bde0c64554
---
 rpms/awips2.core/Installer.java/1.7/component.spec          | 6 +++---
 .../1.7/src/i386/jdk-7u55-linux-i586.tar.gz.REMOVED.git-id  | 1 -
 .../1.7/src/i386/jdk-7u65-linux-i586.tar.gz.REMOVED.git-id  | 1 +
 .../1.7/src/x86_64/jdk-7u55-linux-x64.tar.gz.REMOVED.git-id | 1 -
 .../1.7/src/x86_64/jdk-7u65-linux-x64.tar.gz.REMOVED.git-id | 1 +
 5 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u55-linux-i586.tar.gz.REMOVED.git-id
 create mode 100644 rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u65-linux-i586.tar.gz.REMOVED.git-id
 delete mode 100644 rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u55-linux-x64.tar.gz.REMOVED.git-id
 create mode 100644 rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u65-linux-x64.tar.gz.REMOVED.git-id

diff --git a/rpms/awips2.core/Installer.java/1.7/component.spec b/rpms/awips2.core/Installer.java/1.7/component.spec
index 2a998b7dba..4e2a72a1f8 100644
--- a/rpms/awips2.core/Installer.java/1.7/component.spec
+++ b/rpms/awips2.core/Installer.java/1.7/component.spec
@@ -1,6 +1,6 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g')
 %define _java_major_version 1.7
-%define _java_revision 55
+%define _java_revision 65
 %define _java_version %{_java_major_version}.0_%{_java_revision}
 %define _build_arch %(uname -i)
 %define _java_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -11,7 +11,7 @@
 Name: awips2-java
 Summary: AWIPS II Java Distribution
 Version: %{_java_version}
-Release: 3
+Release: 1
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
@@ -25,7 +25,7 @@ AutoReq: no
 provides: awips2-java
 
 %description
-AWIPS II Java Distribution - Contains Java SE Development Kit (JDK) 1.7.0_55
+AWIPS II Java Distribution - Contains Java SE Development Kit (JDK) 1.7.0_65
 plus additional libraries used by AWIPS II.
 
 %prep
diff --git a/rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u55-linux-i586.tar.gz.REMOVED.git-id b/rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u55-linux-i586.tar.gz.REMOVED.git-id
deleted file mode 100644
index fee9fa7877..0000000000
--- a/rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u55-linux-i586.tar.gz.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-bf93be5f585df5cc8d0494346c7fb009ddca3ae7
\ No newline at end of file
diff --git a/rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u65-linux-i586.tar.gz.REMOVED.git-id b/rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u65-linux-i586.tar.gz.REMOVED.git-id
new file mode 100644
index 0000000000..e5da0840c5
--- /dev/null
+++ b/rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u65-linux-i586.tar.gz.REMOVED.git-id
@@ -0,0 +1 @@
+02af52f6d2dfb339dda7325b41e14e642c68031a
\ No newline at end of file
diff --git a/rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u55-linux-x64.tar.gz.REMOVED.git-id b/rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u55-linux-x64.tar.gz.REMOVED.git-id
deleted file mode 100644
index f865792333..0000000000
--- a/rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u55-linux-x64.tar.gz.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-8eaa63488f97cb7795105aa0f47821efd4554d6c
\ No newline at end of file
diff --git a/rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u65-linux-x64.tar.gz.REMOVED.git-id b/rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u65-linux-x64.tar.gz.REMOVED.git-id
new file mode 100644
index 0000000000..084299eb04
--- /dev/null
+++ b/rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u65-linux-x64.tar.gz.REMOVED.git-id
@@ -0,0 +1 @@
+ddc235cad4204c594b2bc5302108650ba31f3704
\ No newline at end of file