xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1915 - updated Linux java to 6u43.

Browse source 
Change-Id: I39bdb6bbb0cc23c457ddb08ba151ce0b707ff3e7

Former-commit-id: 0f5b4acf4a33a8b3c9a0ba8a30eed16822d117bb
This commit is contained in:
Bryan Kowal 2013-04-18 23:51:54 -05:00
parent 04a734a584
commit c0227ea66d
6 changed files with 8 additions and 243 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
rpms/awips2.core/Installer.java/component.spec
View file

@ -1,4 +1,5 @@
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g') %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g')
%define _java_version 1.6.0_43
%define _build_arch %(uname -i) %define _build_arch %(uname -i)
# #
@ -6,8 +7,8 @@
# #
Name: awips2-java Name: awips2-java
Summary: AWIPS II Java Distribution Summary: AWIPS II Java Distribution
Version: 1.6.0_27 Version: %{_java_version}
Release: 3 Release: 1
Group: AWIPSII Group: AWIPSII
BuildRoot: %{_build_root} BuildRoot: %{_build_root}
BuildArch: %{_build_arch} BuildArch: %{_build_arch}
@ -21,7 +22,7 @@ AutoReq: no
provides: awips2-java provides: awips2-java
%description %description
AWIPS II Java Distribution - Contains Java SE Development Kit (JDK) 1.6.0_27 AWIPS II Java Distribution - Contains Java SE Development Kit (JDK) 1.6.0_43
plus additional libraries used by AWIPS II. plus additional libraries used by AWIPS II.
%prep %prep
@ -72,8 +73,8 @@ else
fi fi
fi fi
JDK_BIN_var_javahome="jdk1.6.0_27" JDK_BIN_var_javahome="jdk%{_java_version}"
jdk_bin="jdk-6u27-linux-${jdk_arch}.bin" jdk_bin="jdk-6u43-linux-${jdk_arch}.bin"
jai_bin="jai-1_1_3-lib-linux-${build_arch}-jdk.bin" jai_bin="jai-1_1_3-lib-linux-${build_arch}-jdk.bin"
jai_imageio_bin="jai_imageio-1_1-lib-linux-${build_arch}-jdk.bin" jai_imageio_bin="jai_imageio-1_1-lib-linux-${build_arch}-jdk.bin"
jai_bin_patch="jai.patch1" jai_bin_patch="jai.patch1"
@ -237,8 +238,6 @@ rm -rf ${RPM_BUILD_ROOT}
%dir /awips2/java/db %dir /awips2/java/db
/awips2/java/db/* /awips2/java/db/*
%dir /awips2/java/demo
/awips2/java/demo/*
%dir /awips2/java/include %dir /awips2/java/include
/awips2/java/include/* /awips2/java/include/*
%dir /awips2/java/jre %dir /awips2/java/jre
@ -254,7 +253,6 @@ rm -rf ${RPM_BUILD_ROOT}
/awips2/java/jre/plugin/* /awips2/java/jre/plugin/*
%dir /awips2/java/lib %dir /awips2/java/lib
/awips2/java/sample
/awips2/java/src.zip /awips2/java/src.zip
%defattr(755,awips,fxalpha,755) %defattr(755,awips,fxalpha,755)

233
rpms/awips2.core/Installer.java/component.spec.old
View file

@ -1,233 +0,0 @@
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g')
#
# AWIPS II Java Spec File
#
Name: awips2-java
Summary: AWIPS II Java Distribution
Version: 1.6.0_27
Release: 1
Group: AWIPSII
BuildRoot: %{_build_root}
URL: N/A
License: N/A
Distribution: N/A
Vendor: Raytheon
Packager: Bryan Kowal
AutoReq: no
provides: awips2-java
%description
AWIPS II Java Distribution - Contains Java SE Development Kit (JDK) 1.6.0_27
plus additional libraries used by AWIPS II.
%prep
# Verify That The User Has Specified A BuildRoot.
if [ "%{_build_root}" = "/tmp" ]
then
echo "An Actual BuildRoot Must Be Specified. Use The --buildroot Parameter."
echo "Unable To Continue ... Terminating"
exit 1
fi
rm -rf %{_build_root}
mkdir -p %{_build_root}/build-java
mkdir -p %{_build_root}/awips2
mkdir -p %{_build_root}/etc/profile.d
%build
%install
JDK_BIN="jdk-6u27-linux-i586.bin"
JDK_BIN_var_javahome="jdk1.6.0_27"
JAI_BIN="jai-1_1_3-lib-linux-i586-jdk.bin"
JAI_PATCH="jai.patch1"
JAI_IMAGEIO_BIN="jai_imageio-1_1-lib-linux-i586-jdk.bin"
JAI_IMAGEIO_PATCH="jai_imageio.patch1"
PYDEV_CER="pydev_certificate.cer"
JAVA_SRC_DIR="%{_baseline_workspace}/Installer.rpm/awips2.core/Installer.java/src"
cp -v ${JAVA_SRC_DIR}/${JDK_BIN} \
%{_build_root}/awips2
if [ $? -ne 0 ]; then
exit 1
fi
pushd .
cd %{_build_root}/awips2
chmod u+x ${JDK_BIN}
if [ $? -ne 0 ]; then
exit 1
fi
./${JDK_BIN} -noregister
if [ $? -ne 0 ]; then
exit 1
fi
mv ${JDK_BIN_var_javahome} java
if [ $? -ne 0 ]; then
exit 1
fi
rm -fv ${JDK_BIN}
if [ $? -ne 0 ]; then
exit 1
fi
cd ${JAVA_SRC_DIR}
patch -i ${JAI_PATCH} -o %{_build_root}/build-java/${JAI_BIN}
if [ $? -ne 0 ]; then
exit 1
fi
patch -i ${JAI_IMAGEIO_PATCH} -o %{_build_root}/build-java/${JAI_IMAGEIO_BIN}
if [ $? -ne 0 ]; then
exit 1
fi
cp -v ${PYDEV_CER} \
%{_build_root}/awips2/java/jre/lib/security
if [ $? -ne 0 ]; then
exit 1
fi
# Used to automatically agree to software licenses.
touch %{_build_root}/build-java/yes.txt
echo "yes" > %{_build_root}/build-java/yes.txt
cd %{_build_root}/awips2/java
chmod u+x %{_build_root}/build-java/${JAI_BIN}
if [ $? -ne 0 ]; then
exit 1
fi
%{_build_root}/build-java/${JAI_BIN} \
< %{_build_root}/build-java/yes.txt
if [ $? -ne 0 ]; then
exit 1
fi
chmod u+x %{_build_root}/build-java/${JAI_IMAGEIO_BIN}
if [ $? -ne 0 ]; then
exit 1
fi
%{_build_root}/build-java/${JAI_IMAGEIO_BIN} \
< %{_build_root}/build-java/yes.txt
if [ $? -ne 0 ]; then
exit 1
fi
touch %{_build_root}/build-java/changeit.txt
echo "changeit" > %{_build_root}/build-java/changeit.txt
chmod 666 %{_build_root}/awips2/java/jre/lib/security/cacerts
if [ $? -ne 0 ]; then
exit 1
fi
%{_build_root}/awips2/java/bin/keytool -import \
-file %{_build_root}/awips2/java/jre/lib/security/pydev_certificate.cer \
-keystore %{_build_root}/awips2/java/jre/lib/security/cacerts \
-noprompt < %{_build_root}/build-java/changeit.txt
if [ $? -ne 0 ]; then
exit 1
fi
popd
# The profile.d environment scripts.
JAVA_SCRIPTS_DIR="%{_baseline_workspace}/Installer.rpm/awips2.core/Installer.java/scripts"
cp -v ${JAVA_SCRIPTS_DIR}/profile.d/* \
%{_build_root}/etc/profile.d
if [ $? -ne 0 ]; then
exit 1
fi
# The licenses
mkdir -p %{_build_root}/awips2/java/licenses
LEGAL_DIR="%{_baseline_workspace}/Installer.rpm/legal"
cp -v ${LEGAL_DIR}/*.txt ${LEGAL_DIR}/*.pdf \
%{_build_root}/awips2/java/licenses
if [ $? -ne 0 ]; then
exit 1
fi
rm -rf %{_build_root}/build-java
%pre
if [ "${1}" = "2" ]; then
# Upgrade. Removing the existing /awips2/java/man
# directory to prevent conflicts.
if [ -d /awips2/java/man ]; then
rm -rf /awips2/java/man
if [ $? -ne 0 ]; then
echo "ERROR: The awips2-java upgrade has FAILED."
exit 1
fi
fi
fi
%post
%preun
%postun
%clean
rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(644,awips,fxalpha,755)
%attr(755,root,root) /etc/profile.d/awips2Java.csh
%attr(755,root,root) /etc/profile.d/awips2Java.sh
%dir /awips2/java
%dir /awips2/java/bin
%doc /awips2/java/COPYRIGHT
%doc /awips2/java/COPYRIGHT-jai_imageio.txt
%doc /awips2/java/COPYRIGHT-jai.txt
%doc /awips2/java/DISTRIBUTIONREADME-jai_imageio.txt
%doc /awips2/java/DISTRIBUTIONREADME-jai.txt
%doc /awips2/java/ENTITLEMENT-jai_imageio.txt
%doc /awips2/java/jre/README
%doc /awips2/java/jre/THIRDPARTYLICENSEREADME.txt
%doc /awips2/java/jre/Welcome.html
%doc /awips2/java/jre/LICENSE
%doc /awips2/java/LICENSE
%doc /awips2/java/LICENSE-jai_imageio.txt
%doc /awips2/java/LICENSE-jai.txt
%docdir /awips2/java/licenses
%dir /awips2/java/licenses
/awips2/java/licenses/*
%docdir /awips2/java/man
%dir /awips2/java/man
/awips2/java/man/*
%doc /awips2/java/README.html
%doc /awips2/java/register.html
%doc /awips2/java/register_ja.html
%doc /awips2/java/register_zh_CN.html
%doc /awips2/java/THIRDPARTYLICENSEREADME-jai_imageio.txt
%doc /awips2/java/THIRDPARTYLICENSEREADME-jai.txt
%doc /awips2/java/THIRDPARTYLICENSEREADME.txt
%doc /awips2/java/UNINSTALL-jai
%doc /awips2/java/UNINSTALL-jai_imageio
%doc /awips2/java/jre/COPYRIGHT
%dir /awips2/java/db
/awips2/java/db/*
%dir /awips2/java/demo
/awips2/java/demo/*
%dir /awips2/java/include
/awips2/java/include/*
%dir /awips2/java/jre
%dir /awips2/java/jre/.systemPrefs
/awips2/java/jre/.systemPrefs/.*
#/awips2/java/jre/.systemPrefs/.systemRootModFile
%dir /awips2/java/jre/bin
/awips2/java/jre/javaws
%dir /awips2/java/jre/lib
%dir /awips2/java/jre/plugin
/awips2/java/jre/plugin/*
%dir /awips2/java/lib
/awips2/java/sample
/awips2/java/src.zip
%defattr(755,awips,fxalpha,755)
/awips2/java/bin/*
/awips2/java/lib/*
/awips2/java/jre/bin/*
/awips2/java/jre/lib/*

1
rpms/awips2.core/Installer.java/src/i386/jdk-6u27-linux-i586.bin.REMOVED.git-id
View file

@ -1 +0,0 @@
303a906829fbffcb6d26248c0d6dca4bf1a115da

1
rpms/awips2.core/Installer.java/src/i386/jdk-6u43-linux-i586.bin.REMOVED.git-id Normal file
View file

@ -0,0 +1 @@
fd11ae34189de6e92d48efa61338ac07de73945b

1
rpms/awips2.core/Installer.java/src/x86_64/jdk-6u27-linux-x64.bin.REMOVED.git-id
View file

@ -1 +0,0 @@
6cb2ac170197c848089dae548835fae6c31d879a

1
rpms/awips2.core/Installer.java/src/x86_64/jdk-6u43-linux-x64.bin.REMOVED.git-id Normal file
View file

@ -0,0 +1 @@
47f6712af338a115406a8965bc027c0e042fb8f7