Merge "Omaha #3417 - Update Linux Java to v1.7.0_65" into omaha_14.4.1
Former-commit-id:e1f02aea42
[formerly3d4728047c
] [formerly61094bf77a
] [formerly61094bf77a
[formerlye7d4631fe1
]] [formerly04f52094f6
[formerly61094bf77a
[formerlye7d4631fe1
] [formerly04f52094f6
[formerly 96f32d193633cb166be86057a244ea8df06fd03e]]]] Former-commit-id:04f52094f6
Former-commit-id: 128a48ff51718407f5b0811ab78b05b3f105007a [formerly fa57a51a12845c93a43268946c5fd752a6ec5c0e] [formerly79e339b381
[formerly24eca33662
]] Former-commit-id:79e339b381
Former-commit-id:f67edb490d
This commit is contained in:
commit
9e9ab2305d
5 changed files with 5 additions and 5 deletions
|
@ -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
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
bf93be5f585df5cc8d0494346c7fb009ddca3ae7
|
|
@ -0,0 +1 @@
|
|||
02af52f6d2dfb339dda7325b41e14e642c68031a
|
|
@ -1 +0,0 @@
|
|||
8eaa63488f97cb7795105aa0f47821efd4554d6c
|
|
@ -0,0 +1 @@
|
|||
ddc235cad4204c594b2bc5302108650ba31f3704
|
Loading…
Add table
Reference in a new issue