Merge branch 'master_14.4.1' of ssh://github.com/Unidata/awips2 into master_14.4.1

Former-commit-id: 7bf0d255c8 [formerly 3de720a1c0] [formerly 49ab43ad81baf357143ea4ddcd67a3caf3203293 [formerly 9a6e0c7868]]
Former-commit-id: 6051b65af7c057aaa0644f788bb53204586b93d8 [formerly c0fbc3fcae]
Former-commit-id: e0837c9e05

rpms/awips2.core/Installer.httpd-pypies/component.spec

@@ -7,7 +7,7 @@
 Summary: Pypies Apache HTTP Server
 Name: awips2-httpd-pypies
 Version: 2.2.15
-Release: 15.5.el6
+Release: 15.6.el6
 URL: http://httpd.apache.org/
 Source0: http://archive.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html

rpms/awips2.upc/Installer.ldm/component.spec

@@ -9,7 +9,7 @@
 Name: awips2-ldm
 Summary: AWIPS II LDM Distribution
 Version: %{_ldm_version}
-Release: 1
+Release: 2
 Group: AWIPSII
 BuildRoot: /tmp
 BuildArch: noarch
@@ -50,7 +50,7 @@ fi
 %install
 
 # create the ldm directory
-/bin/mkdir -p %{_build_root}/usr/local/ldm/SOURCES
+/bin/mkdir -p %{_build_root}/home/awips/ldm/SOURCES
 if [ $? -ne 0 ]; then
    exit 1
 fi
@@ -72,12 +72,12 @@ if [ $? -ne 0 ]; then
 fi
 
 
-_ldm_destination=%{_build_root}/usr/local/ldm
+_ldm_destination=%{_build_root}/home/awips/ldm
 _ldm_destination_source=${_ldm_destination}/SOURCES
 
 _NATIVELIB_PROJECTS=( 'edexBridge' 'decrypt_file' )
 _RPM_directory=%{_baseline_workspace}/rpms
-_Installer_ldm=${_RPM_directory}/awips2.core/Installer.ldm
+_Installer_ldm=${_RPM_directory}/awips2.upc/Installer.ldm
 
 # copy the ldm source to the ldm destination directory.
 /bin/cp ${_Installer_ldm}/src/%{_ldm_src_tar} ${_ldm_destination_source}
@@ -174,14 +174,14 @@ fi
 chown -R ldm:fxalpha ${_ldm_dir}
 
 # create .bash_profile
-if [ ! -f /usr/local/ldm/.bash_profile ]; then
+if [ ! -f /home/awips/.bash_profile ]; then
    echo 'umask 002' > \
-      /usr/local/ldm/.bash_profile
+      /home/awips/.bash_profile
    echo 'export PATH=$HOME/decoders:$HOME/util:$HOME/bin:$PATH' >> \
-      /usr/local/ldm/.bash_profile
+      /home/awips/.bash_profile
    echo 'export MANPATH=$HOME/share/man:/usr/share/man' >> \
-      /usr/local/ldm/.bash_profile
-   /bin/chown ldm:fxalpha /usr/local/ldm/.bash_profile
+      /home/awips/.bash_profile
+   /bin/chown awips:fxalpha /home/awips/ldm/.bash_profile
 fi
 
 pushd . > /dev/null 2>&1
@@ -231,8 +231,8 @@ do
    fi
 done
 /bin/chmod a+x ${_ldm_dir}/bin/*
-/bin/chown ldm:fxalpha ${_ldm_root_dir}/bin
-/bin/chown -R ldm:fxalpha ${_ldm_dir}/etc ${_ldm_dir}/decoders
+/bin/chown awips:fxalpha ${_ldm_root_dir}/bin
+/bin/chown -R awips:fxalpha ${_ldm_dir}/etc ${_ldm_dir}/decoders
 popd > /dev/null 2>&1
 
 # construct pqact
@@ -262,7 +262,7 @@ if [ $? -ne 0 ]; then
    echo "FATAL: failed to remove edexBridge.tar and decrypt_file.tar!"
    exit 1
 fi
-/bin/chown -R ldm:fxalpha ${_ldm_dir}/SOURCES
+/bin/chown -R awips:fxalpha ${_ldm_dir}/SOURCES
 if [ $? -ne 0 ]; then
    echo "FATAL: failed to change owner of ldm SOURCES directory."
    exit 1
@@ -334,10 +334,10 @@ sed -i 's/<size>500M<\/size>/<size>1500M<\/size>/' ${_ldm_dir}/etc/registry.xml
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
-%defattr(-,ldm,fxalpha,-)
-%dir /usr/local/ldm
-%dir /usr/local/ldm/SOURCES
-/usr/local/ldm/SOURCES/*
+%defattr(-,awips,fxalpha,-)
+%dir /home/awips/ldm
+%dir /home/awips/ldm/SOURCES
+/home/awips/ldm/SOURCES/*
 
 %attr(755,root,root) /etc/profile.d/awipsLDM.csh
 %attr(755,root,root) /etc/profile.d/awipsLDM.sh

rpms/awips2.upc/Installer.ldm/patch/etc/scour.conf

@@ -13,5 +13,5 @@
 
 #~ldm/data/dir1			2
 #~ldm/data/dir2			2		*.foo
-~ldm/logs			2		*.stats
+/usr/local/ldm/logs		2		*.stats
 /data_store			1

rpms/build/common/lookupRPM.sh

@@ -225,7 +225,7 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2-ldm" ]; then
-      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.ldm"
+      export RPM_SPECIFICATION="${awips2_upc_dir}/Installer.ldm"
       return 0
    fi
    if [ "${1}" = "awips2-edex-upc" ]; then

rpms/build/x86_64/build.sh

@@ -560,7 +560,7 @@ if [ "${1}" = "-shp" ]; then
 fi
 
 if [ "${1}" = "-edex" ]; then
-   ##buildRPM "awips2-common-base"
+   buildRPM "awips2-common-base"
    #buildRPM "awips2"
    buildEDEX
    #buildRPM "awips2-data.hdf5-topo"

rpms/unidata/buildEnvironment.sh

@@ -13,7 +13,7 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace
 # baseline is...
 export BASELINE="${JENKINS_WORKSPACE}"
 export AWIPSII_VERSION="14.4.1"
-export BUILD_NUMBER="12"
+export BUILD_NUMBER="15"
 export AWIPSII_RELEASE="1n${BUILD_NUMBER}"
 
 export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"