From e5bc0428b734015fc9f13c6c1f86c97b060267c7 Mon Sep 17 00:00:00 2001 From: David Lovely Date: Thu, 3 Dec 2015 09:59:15 -0600 Subject: [PATCH] Omaha #4986 Added build site to RPM package info. Former-commit-id: 6f7adfbc746e295a848522acd9fa346d250af998 --- .../Installer.eclipse/component.spec | 2 +- .../Installer.alertviz/component.spec | 1 + .../Installer.cave-feature/component.spec | 2 +- .../Installer.cave-wrapper/component.spec | 1 + rpms/awips2.cave/Installer.cave/component.spec | 1 + rpms/awips2.cave/deploy.builder/build.sh | 1 + .../Installer.adapt-native/component.spec | 2 +- .../Installer.aviation/component.spec | 2 +- rpms/awips2.core/Installer.cli/component.spec | 2 +- .../Installer.common-base/component.spec | 1 + .../component.spec | 2 +- .../component.spec | 2 +- .../Installer.database/component.spec | 2 +- .../edex/component.spec | 1 + rpms/awips2.core/Installer.gfe/component.spec | 2 +- .../Installer.gfesuite-client/component.spec | 1 + .../Installer.gfesuite-server/component.spec | 1 + .../Installer.groovy/component.spec | 2 +- .../Installer.httpd-pypies/component.spec | 1 + .../Installer.hydroapps/component.spec | 2 +- rpms/awips2.core/Installer.irt/component.spec | 2 +- rpms/awips2.core/Installer.ldm/component.spec | 1 + .../component.spec | 1 + .../Installer.localization/component.spec | 2 +- .../Installer.maps-database/component.spec | 2 +- .../Installer.ncep-database/component.spec | 2 +- .../Installer.notification/component.spec | 1 + .../Installer.pgadmin/component.spec | 1 + .../Installer.pypies/component.spec | 2 +- rpms/awips2.core/Installer.rcm/component.spec | 1 + .../awips2.core/Installer.tools/component.spec | 1 + rpms/awips2.core/Installer.topo/component.spec | 2 +- .../Installer.version/component.spec | 1 + rpms/awips2.core/deploy.builder/build.sh | 9 ++++++--- .../Installer.edex-component/component.spec | 2 +- .../component.spec | 2 +- .../Installer.edex-datadelivery/component.spec | 2 +- .../datadelivery.patch0 | 8 ++++---- .../Installer.edex-hazards/component.spec | 1 + .../Installer.edex-hazards/hazards.patch0 | 18 ++++-------------- .../Installer.edex-shapefiles/component.spec | 2 +- rpms/awips2.edex/Installer.edex/component.spec | 2 +- rpms/awips2.edex/deploy.builder/build.sh | 3 ++- rpms/build/common/rpms.sh | 1 + rpms/build/i386/build.sh | 3 ++- rpms/build/x86_64/build.sh | 5 +++-- .../Installer.cherrypy/component.spec | 1 + .../Installer.dynamicserialize/component.spec | 1 + .../Installer.nose/component.spec | 1 + .../Installer.pmw/component.spec | 1 + .../Installer.pupynere/component.spec | 1 + .../Installer.pycairo/component.spec | 1 + .../Installer.thrift/component.spec | 1 + .../Installer.tpg/component.spec | 1 + .../Installer.ufpy/component.spec | 1 + .../Installer.werkzeug/component.spec | 1 + .../deploy.builder/build.sh | 1 + 57 files changed, 72 insertions(+), 47 deletions(-) diff --git a/rpms/awips2.ade/Installer.eclipse/component.spec b/rpms/awips2.ade/Installer.eclipse/component.spec index fad38abf20..ffab40a606 100644 --- 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 diff --git a/rpms/awips2.cave/Installer.alertviz/component.spec b/rpms/awips2.cave/Installer.alertviz/component.spec index fa9196611a..2d577aef7f 100644 --- 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 diff --git a/rpms/awips2.cave/Installer.cave-feature/component.spec b/rpms/awips2.cave/Installer.cave-feature/component.spec index 4f22ccedb5..0b0133457a 100644 --- 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} diff --git a/rpms/awips2.cave/Installer.cave-wrapper/component.spec b/rpms/awips2.cave/Installer.cave-wrapper/component.spec index 269ab907f7..5bb4530711 100644 --- 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} diff --git a/rpms/awips2.cave/Installer.cave/component.spec b/rpms/awips2.cave/Installer.cave/component.spec index 35993288c3..7072009b3f 100644 --- 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 diff --git a/rpms/awips2.cave/deploy.builder/build.sh b/rpms/awips2.cave/deploy.builder/build.sh index d760e3ebe2..ff3b673416 100644 --- 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 diff --git a/rpms/awips2.core/Installer.adapt-native/component.spec b/rpms/awips2.core/Installer.adapt-native/component.spec index ec39d711ba..4d9e1ceb9c 100644 --- 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 diff --git a/rpms/awips2.core/Installer.aviation/component.spec b/rpms/awips2.core/Installer.aviation/component.spec index c2deb547ea..121782fc26 100644 --- 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 diff --git a/rpms/awips2.core/Installer.cli/component.spec b/rpms/awips2.core/Installer.cli/component.spec index c724304c9f..9809260320 100644 --- 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 diff --git a/rpms/awips2.core/Installer.common-base/component.spec b/rpms/awips2.core/Installer.common-base/component.spec index 743f55d2de..ec2e3d34b8 100644 --- 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 diff --git a/rpms/awips2.core/Installer.database-server-configuration/component.spec b/rpms/awips2.core/Installer.database-server-configuration/component.spec index dcbdccd2b2..3eaf1daeb4 100644 --- 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 diff --git a/rpms/awips2.core/Installer.database-standalone-configuration/component.spec b/rpms/awips2.core/Installer.database-standalone-configuration/component.spec index 744e1edc83..7e43b39249 100644 --- 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 diff --git a/rpms/awips2.core/Installer.database/component.spec b/rpms/awips2.core/Installer.database/component.spec index 607bc10044..33cfa01c55 100644 --- 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 diff --git a/rpms/awips2.core/Installer.edex-environment/edex/component.spec b/rpms/awips2.core/Installer.edex-environment/edex/component.spec index 612b248619..045bf16ea8 100644 --- 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 diff --git a/rpms/awips2.core/Installer.gfe/component.spec b/rpms/awips2.core/Installer.gfe/component.spec index 287259c3bd..53812403c6 100644 --- 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 diff --git a/rpms/awips2.core/Installer.gfesuite-client/component.spec b/rpms/awips2.core/Installer.gfesuite-client/component.spec index 16368aa739..020803b09e 100644 --- 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 diff --git a/rpms/awips2.core/Installer.gfesuite-server/component.spec b/rpms/awips2.core/Installer.gfesuite-server/component.spec index 54ddb92093..00a07e72aa 100644 --- 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 diff --git a/rpms/awips2.core/Installer.groovy/component.spec b/rpms/awips2.core/Installer.groovy/component.spec index 2e43232098..e51af9d12e 100644 --- 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 diff --git a/rpms/awips2.core/Installer.httpd-pypies/component.spec b/rpms/awips2.core/Installer.httpd-pypies/component.spec index 70f670fe31..56fa92adac 100644 --- 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 diff --git a/rpms/awips2.core/Installer.hydroapps/component.spec b/rpms/awips2.core/Installer.hydroapps/component.spec index 880ab2612a..1f21afed83 100644 --- 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 diff --git a/rpms/awips2.core/Installer.irt/component.spec b/rpms/awips2.core/Installer.irt/component.spec index 345c6522a7..c03e40ffec 100644 --- 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 diff --git a/rpms/awips2.core/Installer.ldm/component.spec b/rpms/awips2.core/Installer.ldm/component.spec index a311806a04..fe0929377e 100644 --- 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 diff --git a/rpms/awips2.core/Installer.localapps-environment/component.spec b/rpms/awips2.core/Installer.localapps-environment/component.spec index ce0c3ece46..35ad882662 100644 --- 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 diff --git a/rpms/awips2.core/Installer.localization/component.spec b/rpms/awips2.core/Installer.localization/component.spec index 89138d2bdd..680acc3572 100644 --- 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} diff --git a/rpms/awips2.core/Installer.maps-database/component.spec b/rpms/awips2.core/Installer.maps-database/component.spec index 1364fdf4e8..ab6a6361ed 100644 --- 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 diff --git a/rpms/awips2.core/Installer.ncep-database/component.spec b/rpms/awips2.core/Installer.ncep-database/component.spec index 2c52b0258d..42dc669c79 100644 --- 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 diff --git a/rpms/awips2.core/Installer.notification/component.spec b/rpms/awips2.core/Installer.notification/component.spec index a4d9d0a844..5eb63f856c 100644 --- 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 diff --git a/rpms/awips2.core/Installer.pgadmin/component.spec b/rpms/awips2.core/Installer.pgadmin/component.spec index f6d64dbfaf..c51beeded6 100644 --- 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 diff --git a/rpms/awips2.core/Installer.pypies/component.spec b/rpms/awips2.core/Installer.pypies/component.spec index 58941d8d00..d776c40598 100644 --- 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 diff --git a/rpms/awips2.core/Installer.rcm/component.spec b/rpms/awips2.core/Installer.rcm/component.spec index cfa974e778..2f66e821d9 100644 --- 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 diff --git a/rpms/awips2.core/Installer.tools/component.spec b/rpms/awips2.core/Installer.tools/component.spec index 89b1bd2699..0b36e46679 100644 --- 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 diff --git a/rpms/awips2.core/Installer.topo/component.spec b/rpms/awips2.core/Installer.topo/component.spec index 3ec49a4b52..8da96456cc 100644 --- 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 diff --git a/rpms/awips2.core/Installer.version/component.spec b/rpms/awips2.core/Installer.version/component.spec index 1940a30543..40e810b014 100644 --- 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} diff --git a/rpms/awips2.core/deploy.builder/build.sh b/rpms/awips2.core/deploy.builder/build.sh index 1198e22294..66a437ae46 100644 --- 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=$? diff --git a/rpms/awips2.edex/Installer.edex-component/component.spec b/rpms/awips2.edex/Installer.edex-component/component.spec index ddeec40f4e..1c626fabfe 100644 --- 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 diff --git a/rpms/awips2.edex/Installer.edex-configuration/component.spec b/rpms/awips2.edex/Installer.edex-configuration/component.spec index 9642ae14d7..b74a732526 100644 --- 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 diff --git a/rpms/awips2.edex/Installer.edex-datadelivery/component.spec b/rpms/awips2.edex/Installer.edex-datadelivery/component.spec index 834e822372..d8d94dcca7 100644 --- 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 diff --git a/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0 b/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0 index 2311eec935..8b3a2c8152 100644 --- 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 diff --git a/rpms/awips2.edex/Installer.edex-hazards/component.spec b/rpms/awips2.edex/Installer.edex-hazards/component.spec index c515de89de..7fc631c52a 100644 --- 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 diff --git a/rpms/awips2.edex/Installer.edex-hazards/hazards.patch0 b/rpms/awips2.edex/Installer.edex-hazards/hazards.patch0 index 7cfc0d0eaf..32744b6427 100644 --- 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 diff --git a/rpms/awips2.edex/Installer.edex-shapefiles/component.spec b/rpms/awips2.edex/Installer.edex-shapefiles/component.spec index f3a34c1aeb..e6cb6a47b6 100644 --- 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 diff --git a/rpms/awips2.edex/Installer.edex/component.spec b/rpms/awips2.edex/Installer.edex/component.spec index 219436573f..1fe8e0ccac 100644 --- 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 diff --git a/rpms/awips2.edex/deploy.builder/build.sh b/rpms/awips2.edex/deploy.builder/build.sh index ff168bc062..f92039fdf9 100644 --- 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})' \ diff --git a/rpms/build/common/rpms.sh b/rpms/build/common/rpms.sh index 36e21d63c4..95a15d44d6 100644 --- 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=$? diff --git a/rpms/build/i386/build.sh b/rpms/build/i386/build.sh index 25ea08fbad..f2f578acea 100644 --- 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})' \ diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh index a62c8cc4fb..30fa81e017 100644 --- 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" diff --git a/rpms/python.site-packages/Installer.cherrypy/component.spec b/rpms/python.site-packages/Installer.cherrypy/component.spec index 9f35350d03..2e9352acec 100644 --- 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} diff --git a/rpms/python.site-packages/Installer.dynamicserialize/component.spec b/rpms/python.site-packages/Installer.dynamicserialize/component.spec index 4ca92a23aa..8efcdf9e5e 100644 --- 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} diff --git a/rpms/python.site-packages/Installer.nose/component.spec b/rpms/python.site-packages/Installer.nose/component.spec index 5ec128e1d0..18f6879b79 100644 --- 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} diff --git a/rpms/python.site-packages/Installer.pmw/component.spec b/rpms/python.site-packages/Installer.pmw/component.spec index bb35b80059..aa28ebdeef 100644 --- 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} diff --git a/rpms/python.site-packages/Installer.pupynere/component.spec b/rpms/python.site-packages/Installer.pupynere/component.spec index f27d1bdee9..d441ce04c8 100644 --- 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} diff --git a/rpms/python.site-packages/Installer.pycairo/component.spec b/rpms/python.site-packages/Installer.pycairo/component.spec index f475d90759..d9ca45d02f 100644 --- 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} diff --git a/rpms/python.site-packages/Installer.thrift/component.spec b/rpms/python.site-packages/Installer.thrift/component.spec index f518fc0788..4f3ed78870 100644 --- 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} diff --git a/rpms/python.site-packages/Installer.tpg/component.spec b/rpms/python.site-packages/Installer.tpg/component.spec index bba96c85a8..3f7de41aa6 100644 --- 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} diff --git a/rpms/python.site-packages/Installer.ufpy/component.spec b/rpms/python.site-packages/Installer.ufpy/component.spec index 3cb80399fe..96594dc2c1 100644 --- 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} diff --git a/rpms/python.site-packages/Installer.werkzeug/component.spec b/rpms/python.site-packages/Installer.werkzeug/component.spec index 388abe0311..e33a1e371b 100644 --- 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} diff --git a/rpms/python.site-packages/deploy.builder/build.sh b/rpms/python.site-packages/deploy.builder/build.sh index ffbf95feb0..240ba2d25b 100644 --- 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}