diff --git a/edexOsgi/build.edex/build.xml b/edexOsgi/build.edex/build.xml index 72100336be..42d8f8d77d 100644 --- a/edexOsgi/build.edex/build.xml +++ b/edexOsgi/build.edex/build.xml @@ -10,7 +10,7 @@ + value="true" /> diff --git a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml index 4d8ea295f6..2168280c9d 100644 --- a/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml +++ b/localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml @@ -19,21 +19,53 @@ further_licensing_information. --> - + - + - + - + - + - + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rpms/awips2.upc/Installer.edex-upc/component.spec b/rpms/awips2.upc/Installer.edex-upc/component.spec index ec3443df66..2fa1feabd0 100644 --- a/rpms/awips2.upc/Installer.edex-upc/component.spec +++ b/rpms/awips2.upc/Installer.edex-upc/component.spec @@ -44,7 +44,7 @@ fi # create build root directory rm -rf ${RPM_BUILD_ROOT}/awips2 mkdir -p ${RPM_BUILD_ROOT}/awips2/tools/bin -/bin/cp %{_baseline_workspace}/rpms/awips2.upc/Installer.edex-upc/programs/* ${RPM_BUILD_ROOT}/awips2/tools/bin/ +/bin/cp -r %{_baseline_workspace}/rpms/awips2.upc/Installer.edex-upc/programs/* ${RPM_BUILD_ROOT}/awips2/tools/bin/ %pre @@ -60,4 +60,4 @@ rm -rf ${RPM_BUILD_ROOT}/* %attr(755,awips,fxalpha) /awips2/tools/bin/edex %attr(755,awips,fxalpha) /awips2/tools/bin/arinfo %attr(755,awips,fxalpha) /awips2/tools/bin/areas -%attr(644,awips,fxalpha) /awips2/tools/bin/imgtyp.tbl +%attr(644,awips,fxalpha) /awips2/tools/bin/sat/imgtyp.tbl diff --git a/rpms/unidata/buildEnvironment.sh b/rpms/unidata/buildEnvironment.sh index a30463671a..a3d938222a 100755 --- a/rpms/unidata/buildEnvironment.sh +++ b/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="8" +export BUILD_NUMBER="11" export AWIPSII_RELEASE="1n${BUILD_NUMBER}" export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"