From 35f6a5ac251f42e49ecbca8b3db622f988a92403 Mon Sep 17 00:00:00 2001 From: Brad Gonzales Date: Thu, 8 May 2014 16:15:42 -0500 Subject: [PATCH] Omaha #3032 updated jdk to java 1.7.0_55 Change-Id: If1bcb03386aec265196cf8133a3f1e6b34eb1fc8 Former-commit-id: 49cc6d83ac5fffc3f737699ab605948fa38117db --- rpms/awips2.core/Installer.java/1.7/component.spec | 8 ++++---- .../src/i386/jdk-7u51-linux-i586.tar.gz.REMOVED.git-id | 1 - .../src/i386/jdk-7u55-linux-i586.tar.gz.REMOVED.git-id | 1 + .../src/x86_64/jdk-7u51-linux-x64.tar.gz.REMOVED.git-id | 1 - .../src/x86_64/jdk-7u55-linux-x64.tar.gz.REMOVED.git-id | 1 + 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u51-linux-i586.tar.gz.REMOVED.git-id create mode 100644 rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u55-linux-i586.tar.gz.REMOVED.git-id delete mode 100644 rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u51-linux-x64.tar.gz.REMOVED.git-id create mode 100644 rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u55-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 ffe21ec6ca..2a998b7dba 100644 --- a/rpms/awips2.core/Installer.java/1.7/component.spec +++ b/rpms/awips2.core/Installer.java/1.7/component.spec @@ -1,7 +1,7 @@ %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 51 -%define _java_version %{_java_major_version}.0_%{_java_revision} +%define _java_revision 55 +%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: 2 +Release: 3 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_51 +AWIPS II Java Distribution - Contains Java SE Development Kit (JDK) 1.7.0_55 plus additional libraries used by AWIPS II. %prep diff --git a/rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u51-linux-i586.tar.gz.REMOVED.git-id b/rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u51-linux-i586.tar.gz.REMOVED.git-id deleted file mode 100644 index 425027f03d..0000000000 --- a/rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u51-linux-i586.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -604f772dda768d347b069fe0e554e4b06d7f7221 \ No newline at end of file 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 new file mode 100644 index 0000000000..fee9fa7877 --- /dev/null +++ b/rpms/awips2.core/Installer.java/1.7/src/i386/jdk-7u55-linux-i586.tar.gz.REMOVED.git-id @@ -0,0 +1 @@ +bf93be5f585df5cc8d0494346c7fb009ddca3ae7 \ No newline at end of file diff --git a/rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u51-linux-x64.tar.gz.REMOVED.git-id b/rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u51-linux-x64.tar.gz.REMOVED.git-id deleted file mode 100644 index 7e19b97ece..0000000000 --- a/rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u51-linux-x64.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -aa778934ff47beffe54ddc05cc1fc0af578a25c0 \ 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 new file mode 100644 index 0000000000..f865792333 --- /dev/null +++ b/rpms/awips2.core/Installer.java/1.7/src/x86_64/jdk-7u55-linux-x64.tar.gz.REMOVED.git-id @@ -0,0 +1 @@ +8eaa63488f97cb7795105aa0f47821efd4554d6c \ No newline at end of file