Merge "Omaha #4986 Added build site to RPM package info." into omaha_16.2.2

Former-commit-id: 62b357c75602ef0ab4c6dba51af580e30dfd3c19
2015-12-08 07:37:35 -06:00 · 2015-12-08 07:37:35 -06:00 · 7a94c92de6
commit 7a94c92de6
parent 39c325b8e0 e5bc0428b7
57 changed files with 72 additions and 47 deletions
--- a/rpms/awips2.ade/Installer.eclipse/component.spec
+++ b/rpms/awips2.ade/Installer.eclipse/component.spec
@ -17,7 +17,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-eclipse
--- a/rpms/awips2.cave/Installer.alertviz/component.spec
+++ b/rpms/awips2.cave/Installer.alertviz/component.spec
@ -19,6 +19,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Provides: awips2-alertviz
--- a/rpms/awips2.cave/Installer.cave-feature/component.spec
+++ b/rpms/awips2.cave/Installer.cave-feature/component.spec
@ -17,7 +17,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: %{_component_name} = %{_component_version}
--- a/rpms/awips2.cave/Installer.cave-wrapper/component.spec
+++ b/rpms/awips2.cave/Installer.cave-wrapper/component.spec
@ -21,6 +21,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Provides: %{_component_name}
--- a/rpms/awips2.cave/Installer.cave/component.spec
+++ b/rpms/awips2.cave/Installer.cave/component.spec
@ -29,6 +29,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-cave
--- a/rpms/awips2.cave/deploy.builder/build.sh
+++ b/rpms/awips2.cave/deploy.builder/build.sh
@ -99,6 +99,7 @@ function buildCAVERPM()
      --define '_build_bits %(echo ${CAVE_BUILD_BITS})' \
      --define '_component_name %(echo ${RPM_NAME})' \
      --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
+      --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
      --buildroot ${AWIPSII_BUILD_ROOT} ${COMPONENT_SPECS}
   # If We Are Unable To Build An RPM, Fail The Build:
   if [ $? -ne 0 ]; then
--- a/rpms/awips2.core/Installer.adapt-native/component.spec
+++ b/rpms/awips2.core/Installer.adapt-native/component.spec
@ -12,7 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-adapt-native
--- a/rpms/awips2.core/Installer.aviation/component.spec
+++ b/rpms/awips2.core/Installer.aviation/component.spec
@ -12,7 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-aviation-shared
--- a/rpms/awips2.core/Installer.cli/component.spec
+++ b/rpms/awips2.core/Installer.cli/component.spec
@ -16,7 +16,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-cli
--- a/rpms/awips2.core/Installer.common-base/component.spec
+++ b/rpms/awips2.core/Installer.common-base/component.spec
@ -18,6 +18,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Provides: awips2-common-base
--- a/rpms/awips2.core/Installer.database-server-configuration/component.spec
+++ b/rpms/awips2.core/Installer.database-server-configuration/component.spec
@ -12,7 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 requires: awips2-postgresql
--- a/rpms/awips2.core/Installer.database-standalone-configuration/component.spec
+++ b/rpms/awips2.core/Installer.database-standalone-configuration/component.spec
@ -12,7 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 requires: awips2-postgresql
--- a/rpms/awips2.core/Installer.database/component.spec
+++ b/rpms/awips2.core/Installer.database/component.spec
@ -17,7 +17,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-database
--- a/rpms/awips2.core/Installer.edex-environment/edex/component.spec
+++ b/rpms/awips2.core/Installer.edex-environment/edex/component.spec
@ -13,6 +13,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Provides: awips2-edex-environment
--- a/rpms/awips2.core/Installer.gfe/component.spec
+++ b/rpms/awips2.core/Installer.gfe/component.spec
@ -14,7 +14,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-data.gfe
--- a/rpms/awips2.core/Installer.gfesuite-client/component.spec
+++ b/rpms/awips2.core/Installer.gfesuite-client/component.spec
@ -12,6 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Provides: awips2-gfesuite-client
--- a/rpms/awips2.core/Installer.gfesuite-server/component.spec
+++ b/rpms/awips2.core/Installer.gfesuite-server/component.spec
@ -12,6 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Provides: awips2-gfesuite-server
--- a/rpms/awips2.core/Installer.groovy/component.spec
+++ b/rpms/awips2.core/Installer.groovy/component.spec
@ -13,7 +13,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-groovy
--- a/rpms/awips2.core/Installer.httpd-pypies/component.spec
+++ b/rpms/awips2.core/Installer.httpd-pypies/component.spec
@ -8,6 +8,7 @@ Summary: Pypies Apache HTTP Server
 Name: awips2-httpd-pypies
 Version: 2.2.15
 Release: 15.5.el6
+Packager: %{_build_site}
 URL: http://httpd.apache.org/
 Source0: http://archive.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
--- a/rpms/awips2.core/Installer.hydroapps/component.spec
+++ b/rpms/awips2.core/Installer.hydroapps/component.spec
@ -13,7 +13,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-hydroapps-shared
--- a/rpms/awips2.core/Installer.irt/component.spec
+++ b/rpms/awips2.core/Installer.irt/component.spec
@ -12,7 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-irt
--- a/rpms/awips2.core/Installer.ldm/component.spec
+++ b/rpms/awips2.core/Installer.ldm/component.spec
@ -17,6 +17,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Requires: awips2-qpid-lib
--- a/rpms/awips2.core/Installer.localapps-environment/component.spec
+++ b/rpms/awips2.core/Installer.localapps-environment/component.spec
@ -12,6 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Provides: awips2-localapps-environment
--- a/rpms/awips2.core/Installer.localization/component.spec
+++ b/rpms/awips2.core/Installer.localization/component.spec
@ -12,7 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: %{_component_name}
--- a/rpms/awips2.core/Installer.maps-database/component.spec
+++ b/rpms/awips2.core/Installer.maps-database/component.spec
@ -14,7 +14,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-maps-database
--- a/rpms/awips2.core/Installer.ncep-database/component.spec
+++ b/rpms/awips2.core/Installer.ncep-database/component.spec
@ -15,7 +15,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: NCEP/NCO/SIB CWA
-Packager: J. Zeng / B. Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-ncep-database
--- a/rpms/awips2.core/Installer.notification/component.spec
+++ b/rpms/awips2.core/Installer.notification/component.spec
@ -25,6 +25,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Requires: boost >= 1.33.1
--- a/rpms/awips2.core/Installer.pgadmin/component.spec
+++ b/rpms/awips2.core/Installer.pgadmin/component.spec
@ -17,6 +17,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 BuildRequires: awips2-postgresql = 9.3.9
--- a/rpms/awips2.core/Installer.pypies/component.spec
+++ b/rpms/awips2.core/Installer.pypies/component.spec
@ -11,7 +11,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Nate Jensen
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-pypies
--- a/rpms/awips2.core/Installer.rcm/component.spec
+++ b/rpms/awips2.core/Installer.rcm/component.spec
@ -15,6 +15,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Provides: awips2-rcm
--- a/rpms/awips2.core/Installer.tools/component.spec
+++ b/rpms/awips2.core/Installer.tools/component.spec
@ -16,6 +16,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Provides: awips2-tools
--- a/rpms/awips2.core/Installer.topo/component.spec
+++ b/rpms/awips2.core/Installer.topo/component.spec
@ -12,7 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-data.hdf5-topo
--- a/rpms/awips2.core/Installer.version/component.spec
+++ b/rpms/awips2.core/Installer.version/component.spec
@ -24,6 +24,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 provides: %{_component_name}
--- a/rpms/awips2.core/deploy.builder/build.sh
+++ b/rpms/awips2.core/deploy.builder/build.sh
@ -65,7 +65,7 @@ function buildRPM()
      echo "The AWIPSII Version is $AWIPSII_VERSION in the buildRPM function"
      echo "The AWIPSII Release is $AWIPSII_RELEASE in the buildRPM function"

-      rpmbuild -ba --target=i386 \
+      rpmbuild -bb --target=i386 \
         --define '_topdir %(echo ${RPM_TOP_DIR})' \
         --define '_component_version %(echo ${AWIPSII_VERSION})' \
         --define '_component_release %(echo ${AWIPSII_RELEASE})' \
@ -73,6 +73,7 @@ function buildRPM()
         --define '_component_build_time %(echo ${AWIPSII_BUILD_TIME})' \
         --define '_component_build_system %(echo ${AWIPSII_BUILD_SYSTEM})' \
         --define '_svn_tag %(echo ${AWIPSII_BUILD_TAG})' \
+         --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
         --buildroot ${BUILDROOT_DIR} \
         ${COMPONENT_SPECS}

@ -92,9 +93,10 @@ function buildRPM()

   export BUILDROOT_DIR="${BUILDROOT_DIR}"
   # Build The RPM.
-   rpmbuild -ba --target=i386 \
+   rpmbuild -bb --target=i386 \
      --define '_topdir %(echo ${RPM_TOP_DIR})' \
      --define '_build_root %(echo ${BUILDROOT_DIR})' \
+      --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
      --define '_component_version %(echo ${AWIPSII_VERSION})' \
      --define '_component_release %(echo ${AWIPSII_RELEASE})' \
      --define '_baseline_workspace %(echo ${WORKSPACE_DIR})' \
@ -142,7 +144,7 @@ function buildLocalizationRPMs()

      rm -rf ${BUILDROOT_DIR}

-      rpmbuild -ba \
+      rpmbuild -bb \
         --define '_topdir %(echo ${RPM_TOP_DIR})' \
         --define '_component_version %(echo ${AWIPSII_VERSION})' \
         --define '_component_release %(echo ${AWIPSII_RELEASE})' \
@ -150,6 +152,7 @@ function buildLocalizationRPMs()
         --define '_baseline_workspace %(echo ${WORKSPACE_DIR})' \
         --define '_localization_site %(echo ${site})' \
         --define '_localization_directory %(echo ${LOCALIZATION_DIRECTORY})' \
+         --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
         --buildroot ${BUILDROOT_DIR} \
         ../Installer.localization/component.spec
      RC=$?
--- a/rpms/awips2.edex/Installer.edex-component/component.spec
+++ b/rpms/awips2.edex/Installer.edex-component/component.spec
@ -16,7 +16,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 provides: awips2-%{_component_name}
 requires: awips2
--- a/rpms/awips2.edex/Installer.edex-configuration/component.spec
+++ b/rpms/awips2.edex/Installer.edex-configuration/component.spec
@ -12,7 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-edex-configuration
--- a/rpms/awips2.edex/Installer.edex-datadelivery/component.spec
+++ b/rpms/awips2.edex/Installer.edex-datadelivery/component.spec
@ -16,7 +16,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 provides: awips2-edex-datadelivery
 requires: awips2
--- a/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
+++ b/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
@ -1,5 +1,5 @@
-*** Installer.edex-component/component.spec	2015-08-25 15:19:06.962255321 -0500
--- Installer.edex-datadelivery/component.spec	2015-09-15 15:57:16.669506673 -0500
+*** Installer.edex-component/component.spec	2015-12-01 15:13:59.047022621 -0600
+--- Installer.edex-datadelivery/component.spec	2015-12-01 15:13:59.048022609 -0600
 ***************
 *** 6,13 ****
  %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
@ -22,7 +22,7 @@
 ***************
 *** 18,24 ****
  Vendor: Raytheon
-  Packager: Bryan Kowal
+  Packager: %{_build_site}
  
 ! provides: awips2-%{_component_name}
  requires: awips2
@ -30,7 +30,7 @@
  requires: awips2-python
 --- 18,24 ----
  Vendor: Raytheon
-  Packager: Bryan Kowal
+  Packager: %{_build_site}
  
 ! provides: awips2-edex-datadelivery
  requires: awips2
--- a/rpms/awips2.edex/Installer.edex-hazards/component.spec
+++ b/rpms/awips2.edex/Installer.edex-hazards/component.spec
@ -16,6 +16,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 provides: awips2-%{_component_name}
 requires: awips2
--- a/rpms/awips2.edex/Installer.edex-hazards/hazards.patch0
+++ b/rpms/awips2.edex/Installer.edex-hazards/hazards.patch0
@ -1,5 +1,5 @@
-*** Installer.edex-component/component.spec	2015-08-25 15:19:06.962255321 -0500
--- Installer.edex-hazards/component.spec	2015-09-17 14:08:29.271876049 -0500
+*** Installer.edex-component/component.spec	2015-12-01 15:13:59.047022621 -0600
+--- Installer.edex-hazards/component.spec	2015-12-01 15:13:59.054022541 -0600
 ***************
 *** 1,5 ****
  #
@ -14,18 +14,8 @@
  %define __prelink_undo_cmd %{nil}
  # Turn off the brp-python-bytecompile script
 ***************
-*** 16,22 ****
-  License: N/A
-  Distribution: N/A
-  Vendor: Raytheon
- Packager: Bryan Kowal
-  
-  provides: awips2-%{_component_name}
-  requires: awips2
--- 16,21 ----
-***************
 *** 55,60 ****
--- 54,107 ----
+--- 55,108 ----
     exit 1
  fi
  
@ -82,7 +72,7 @@
  if [ -d %{_build_root}/$UTILITY ]; then
 ***************
 *** 87,90 ****
--- 134,140 ----
+--- 135,141 ----
  %defattr(644,awips,fxalpha,755)
  %dir /awips2
  %dir /awips2/edex
--- a/rpms/awips2.edex/Installer.edex-shapefiles/component.spec
+++ b/rpms/awips2.edex/Installer.edex-shapefiles/component.spec
@ -12,7 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 AutoReq: no
 provides: awips2-edex-shapefiles
--- a/rpms/awips2.edex/Installer.edex/component.spec
+++ b/rpms/awips2.edex/Installer.edex/component.spec
@ -11,7 +11,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}

 provides: awips2-edex
 provides: awips2-base-component
--- a/rpms/awips2.edex/deploy.builder/build.sh
+++ b/rpms/awips2.edex/deploy.builder/build.sh
@ -107,12 +107,13 @@ function buildRPM()

   if [ ! "${COMPONENT_NAME}" = "edex-binlightning" ] ||
      [ ${LIGHTNING} = true ]; then
-      rpmbuild -ba --target=${TARGET_BUILD_ARCH} \
+      rpmbuild -bb --target=${TARGET_BUILD_ARCH} \
         --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
         --define '_baseline_workspace %(echo ${WORKSPACE})' \
         --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
         --define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
         --define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
+         --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
         --define '_component_version %(echo ${AWIPSII_VERSION})' \
         --define '_component_release %(echo ${AWIPSII_RELEASE})' \
         --define '_component_name %(echo ${COMPONENT_NAME})' \
--- a/rpms/build/common/rpms.sh
+++ b/rpms/build/common/rpms.sh
@ -89,6 +89,7 @@ function buildLocalizationRPMs()
         --define '_baseline_workspace %(echo ${WORKSPACE})' \
         --define '_localization_directory %(echo ${LOCALIZATION_DIRECTORY})' \
         --define '_localization_site %(echo ${site})' \
+         --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
         --buildroot ${AWIPSII_BUILD_ROOT} \
         ${localization_SPECIFICATION}
      RC=$?
--- a/rpms/build/i386/build.sh
+++ b/rpms/build/i386/build.sh
@ -10,12 +10,13 @@ function buildRPM()
      exit 1
   fi

-   /usr/bin/rpmbuild -ba \
+   /usr/bin/rpmbuild -bb \
      --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
      --define '_baseline_workspace %(echo ${WORKSPACE})' \
      --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
      --define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
      --define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
+      --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
      --define '_component_version %(echo ${AWIPSII_VERSION})' \
      --define '_component_release %(echo ${AWIPSII_RELEASE})' \
      --define '_component_build_date %(echo ${COMPONENT_BUILD_DATE})' \
--- a/rpms/build/x86_64/build.sh
+++ b/rpms/build/x86_64/build.sh
@ -26,6 +26,7 @@ function buildRPMExec()
      --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
      --define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
      --define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
+      --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
      --define '_component_version %(echo ${AWIPSII_VERSION})' \
      --define '_component_release %(echo ${AWIPSII_RELEASE})' \
      --define '_component_build_date %(echo ${COMPONENT_BUILD_DATE})' \
@ -122,6 +123,7 @@ if [ "${1}" = "-rh6" ]; then
   if [ $? -ne 0 ]; then
      exit 1
   fi
+   buildRPM "awips2-alertviz"
   buildEDEX
   if [ $? -ne 0 ]; then
      exit 1
@ -169,7 +171,6 @@ if [ "${1}" = "-rh6" ]; then
   buildRPM "awips2-qpid-java"
   buildRPM "awips2-qpid-java-broker"
   buildRPM "awips2-ldm"
-   buildRPM "awips2-alertviz"
   buildRPM "awips2-database-server-configuration"
   buildRPM "awips2-database-standalone-configuration"
   buildRPM "awips2-database"
@ -198,7 +199,7 @@ fi

 if [ "${1}" = "-ade" ]; then
   buildRPM "awips2-eclipse"
-   buildJava
+   buildRPM "awips2-java"
   buildRPM "awips2-ant"
   buildRPM "awips2-python"
   buildRPM "awips2-python-cherrypy"
--- a/rpms/python.site-packages/Installer.cherrypy/component.spec
+++ b/rpms/python.site-packages/Installer.cherrypy/component.spec
@ -17,6 +17,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Requires: awips2-python = %{_installed_python}
--- a/rpms/python.site-packages/Installer.dynamicserialize/component.spec
+++ b/rpms/python.site-packages/Installer.dynamicserialize/component.spec
@ -17,6 +17,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Requires: awips2-python = %{_installed_python}
--- a/rpms/python.site-packages/Installer.nose/component.spec
+++ b/rpms/python.site-packages/Installer.nose/component.spec
@ -18,6 +18,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Requires: awips2-python = %{_installed_python}
--- a/rpms/python.site-packages/Installer.pmw/component.spec
+++ b/rpms/python.site-packages/Installer.pmw/component.spec
@ -18,6 +18,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Requires: awips2-python = %{_installed_python}
--- a/rpms/python.site-packages/Installer.pupynere/component.spec
+++ b/rpms/python.site-packages/Installer.pupynere/component.spec
@ -19,6 +19,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Requires: awips2-python = %{_installed_python}
--- a/rpms/python.site-packages/Installer.pycairo/component.spec
+++ b/rpms/python.site-packages/Installer.pycairo/component.spec
@ -18,6 +18,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Requires: awips2-python = %{_installed_python}
--- a/rpms/python.site-packages/Installer.thrift/component.spec
+++ b/rpms/python.site-packages/Installer.thrift/component.spec
@ -17,6 +17,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 requires: awips2-python = %{_installed_python}
--- a/rpms/python.site-packages/Installer.tpg/component.spec
+++ b/rpms/python.site-packages/Installer.tpg/component.spec
@ -18,6 +18,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 requires: awips2-python = %{_installed_python}
--- a/rpms/python.site-packages/Installer.ufpy/component.spec
+++ b/rpms/python.site-packages/Installer.ufpy/component.spec
@ -17,6 +17,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Requires: awips2-python = %{_installed_python}
--- a/rpms/python.site-packages/Installer.werkzeug/component.spec
+++ b/rpms/python.site-packages/Installer.werkzeug/component.spec
@ -18,6 +18,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}

 AutoReq: no
 Requires: awips2-python = %{_installed_python}
--- a/rpms/python.site-packages/deploy.builder/build.sh
+++ b/rpms/python.site-packages/deploy.builder/build.sh
@ -61,6 +61,7 @@ function buildRPM()
      --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
      --define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
      --define '_build_root %(echo ${BUILDROOT_DIR})' \
+      --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
      --define '_component_version %(echo ${AWIPSII_VERSION})' \
      --define '_component_release %(echo ${AWIPSII_RELEASE})' \
      --buildroot ${BUILDROOT_DIR} ${COMPONENT_SPECS}