From 5b451d09f1ec0c0ec2e6c6fe80ec4a660217b38b Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Thu, 11 Jul 2013 21:46:28 -0500 Subject: [PATCH] Issue #2163 - 64-bit RHEL6 rpm conversion - converted ant and added ant source to the repository (will no longer need to be retrieved from awipscm) - converted Java - converted the hdf5 tools and lzf is now built from source in addition to the hdf5 tools - fixed python h5py to correctly include the built libsz libraries Former-commit-id: 0bee225031b8bcdcd90fbf77e2ad40e82f09b03e [formerly 0bee225031b8bcdcd90fbf77e2ad40e82f09b03e [formerly ffc8892888976ee4b9d9edeb315b74edc5bb375f]] Former-commit-id: e686f9bdda08baf2223fbc2200919c26bf392e5a Former-commit-id: e24b249d5b67c799c0b7090c84bf7c5e447fd26b --- rpms/awips2.core/Installer.ant/component.spec | 68 +++----- .../src/apache-ant-1.7.1-bin.tar.gz | Bin 0 -> 9151860 bytes .../Installer.java/1.6/component.spec | 64 +++++--- .../Installer.java/1.7/component.spec | 47 +++--- .../Installer.tools/component.spec | 149 +++++++----------- .../Installer.h5py/component.spec | 23 +-- 6 files changed, 163 insertions(+), 188 deletions(-) create mode 100644 rpms/awips2.core/Installer.ant/src/apache-ant-1.7.1-bin.tar.gz diff --git a/rpms/awips2.core/Installer.ant/component.spec b/rpms/awips2.core/Installer.ant/component.spec index 4dee80b0c4..1d1ed8fe86 100644 --- a/rpms/awips2.core/Installer.ant/component.spec +++ b/rpms/awips2.core/Installer.ant/component.spec @@ -1,3 +1,4 @@ +%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') # # AWIPS II Ant Spec File # @@ -6,7 +7,7 @@ Summary: AWIPS II Ant Distribution Version: 1.7.1 Release: 2 Group: AWIPSII -BuildRoot: /tmp +BuildRoot: %{_build_root} BuildArch: noarch Prefix: /awips2/ant URL: N/A @@ -21,23 +22,17 @@ provides: awips2-ant %description AWIPS II Ant Distribution - Contains Ant V1.7.1 -# Turn off the brp-python-bytecompile script -%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') - %prep # Verify That The User Has Specified A BuildRoot. -if [ "${RPM_BUILD_ROOT}" = "/tmp" ] +if [ "%{_build_root}" = "" ] then - echo "An Actual BuildRoot Must Be Specified. Use The --buildroot Parameter." + echo "A Build Root has not been specified." echo "Unable To Continue ... Terminating" exit 1 fi -mkdir -p ${RPM_BUILD_ROOT}/awips2/ant -mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d - -PROFILE_D_DIR="rpms/awips2.core/Installer.ant/scripts/profile.d" -cp %{_baseline_workspace}/${PROFILE_D_DIR}/* ${RPM_BUILD_ROOT}/etc/profile.d +rm -rf %{_build_root} +mkdir -p %{_build_root} %build @@ -50,32 +45,39 @@ function copyLegal() COMPONENT_BUILD_DIR=${1} - mkdir -p ${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses + mkdir -p %{_build_root}/${COMPONENT_BUILD_DIR}/licenses # Create a Tar file with our FOSS licenses. tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \ %{_baseline_workspace}/rpms/legal/FOSS_licenses/ cp %{_baseline_workspace}/rpms/legal/license.txt \ - ${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses + %{_build_root}/${COMPONENT_BUILD_DIR}/licenses cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \ - ${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses + %{_build_root}/${COMPONENT_BUILD_DIR}/licenses cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \ - ${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses + %{_build_root}/${COMPONENT_BUILD_DIR}/licenses rm -f %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar } +mkdir -p ${RPM_BUILD_ROOT}/awips2/ant +mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d + +_core_rpms="%{_baseline_workspace}/rpms/awips2.core" +_installer_ant="${_core_rpms}/Installer.ant" ANT_TAR_FILE="apache-ant-1.7.1-bin.tar.gz" -ANT_TAR_FILE_SRC_DIR="CMLibrary/Software/OpenSource/Ant/v1.7.1" # Will Be Extracted Into apache-ant-1.7.1 -tar -xf %{_awipscm_share}/${ANT_TAR_FILE_SRC_DIR}/${ANT_TAR_FILE} \ - -C ${RPM_BUILD_ROOT}/awips2 +tar -xf ${_installer_ant}/src/${ANT_TAR_FILE} \ + -C %{_build_root}/awips2 # Move Files From 1.7.1 To The Generic Directory -cp -r ${RPM_BUILD_ROOT}/awips2/apache-ant-1.7.1/* \ - ${RPM_BUILD_ROOT}/awips2/ant -rm -rf ${RPM_BUILD_ROOT}/awips2/apache-ant-1.7.1 +cp -r %{_build_root}/awips2/apache-ant-1.7.1/* \ + %{_build_root}/awips2/ant +rm -rf %{_build_root}/awips2/apache-ant-1.7.1 + +PROFILE_D_DIR="rpms/awips2.core/Installer.ant/scripts/profile.d" +cp %{_baseline_workspace}/${PROFILE_D_DIR}/* %{_build_root}/etc/profile.d copyLegal "awips2/ant" @@ -83,40 +85,16 @@ copyLegal "awips2/ant" if [ "${1}" = "2" ]; then exit 0 fi -echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m" -echo -e "\e[1;34m\| Installing the AWIPS II Ant Distribution...\e[m" -echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m" -echo -e "\e[1;34m Installation Root = ${RPM_INSTALL_PREFIX}\e[m" %post -function printFailureMessage() -{ - echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m" - echo -e "\e[1;31m\| AWIPS II Ant Distribution Installation - FAILED\e[m" - echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m" -} -echo "--------------------------------------------------------------------------------" -echo "\| Setting up AWIPS II Ant Runtime and Environment..." -echo "--------------------------------------------------------------------------------" - -echo "--------------------------------------------------------------------------------" -echo "\| Adding Environment Variables for AWIPS II Ant" -echo "--------------------------------------------------------------------------------" - if [ "${1}" = "2" ]; then exit 0 fi -echo -e "\e[1;32m--------------------------------------------------------------------------------\e[m" -echo -e "\e[1;32m\| AWIPS II Ant Distribution Installation - COMPLETE\e[m" -echo -e "\e[1;32m--------------------------------------------------------------------------------\e[m" %postun if [ "${1}" = "1" ]; then exit 0 fi -echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m" -echo -e "\e[1;34m\| The AWIPS II Ant Distribution Has Been Successfully Removed\e[m" -echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m" %clean rm -rf ${RPM_BUILD_ROOT} diff --git a/rpms/awips2.core/Installer.ant/src/apache-ant-1.7.1-bin.tar.gz b/rpms/awips2.core/Installer.ant/src/apache-ant-1.7.1-bin.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4ca02bd9c053937911a751f614ecdd8778ebdf67 GIT binary patch literal 9151860 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