diff --git a/rpms/awips2.core/Installer.database/component.spec b/rpms/awips2.core/Installer.database/component.spec index 0cd055b52d..032ce4ac30 100644 --- a/rpms/awips2.core/Installer.database/component.spec +++ b/rpms/awips2.core/Installer.database/component.spec @@ -22,7 +22,7 @@ Packager: %{_build_site} AutoReq: no Provides: awips2-database Provides: awips2-static-user -Requires: libpng, awips2 +Requires: awips2, libpng, perl Requires: awips2-postgresql Requires: awips2-psql Requires: netcdf >= 4.0.0 diff --git a/rpms/awips2.core/Installer.gfesuite/component.spec b/rpms/awips2.core/Installer.gfesuite/component.spec index a070024179..80f374c7b1 100644 --- a/rpms/awips2.core/Installer.gfesuite/component.spec +++ b/rpms/awips2.core/Installer.gfesuite/component.spec @@ -18,14 +18,11 @@ Obsoletes: awips2-gfesuite-server Obsoletes: awips2-gfesuite-client AutoReq: no -Provides: awips2-gfesuite -Requires: awips2-python-numpy -Requires: awips2-java -Requires: awips2-cave -Requires: xorg-x11-server-Xvfb +Provides: awips2-gfesuite, awips2-python-numpy, awips2-java, awips2-cave +Requires: perl, xorg-x11-server-Xvfb -BuildRequires: awips2-ant -BuildRequires: awips2-java +BuildRequires: awips2-ant, awips2-java +BuildRequires: perl %description AWIPS II gfesuite Installation - Contains The AWIPS II gfesuite Component. diff --git a/rpms/awips2.core/Installer.localization/component.spec b/rpms/awips2.core/Installer.localization/component.spec index d61d30f455..2e63ab043f 100644 --- a/rpms/awips2.core/Installer.localization/component.spec +++ b/rpms/awips2.core/Installer.localization/component.spec @@ -107,7 +107,8 @@ do cp -R $UTIL/siteconfig/* $SITE_DIR/ grep -rl 'XXX' $SITE_DIR | xargs sed -i 's/XXX/'$site'/g' done - +ls -la $BUILD_DIR/utility/cave_static +find $BUILD_DIR/utility/cave_static # COMMON cp -R $UTIL/common_static/* $COMMON_DIR/ @@ -128,6 +129,11 @@ cp -rv %{_baseline_workspace}/localization/utility/* \ if [ $? -ne 0 ]; then exit 1 fi +cp -rv %{_baseline_workspace}/rpms/awips2.core/Installer.localization/utility/* \ + ${RPM_BUILD_ROOT}/awips2/edex/data/utility +if [ $? -ne 0 ]; then + exit 1 +fi # Copy FFMP shapefiles from awips2-static mkdir -p ${RPM_BUILD_ROOT}/awips2/edex/data/utility/common_static/site/OAX/shapefiles/FFMP/ if [ $? -ne 0 ]; then diff --git a/rpms/awips2.core/Installer.maps-database/component.spec b/rpms/awips2.core/Installer.maps-database/component.spec index 278385680e..c58317769c 100644 --- a/rpms/awips2.core/Installer.maps-database/component.spec +++ b/rpms/awips2.core/Installer.maps-database/component.spec @@ -18,7 +18,7 @@ Packager: %{_build_site} AutoReq: no Provides: awips2-maps-database -Requires: awips2-database +Requires: awips2-database, perl %description AWIPS II Maps Database - includes the diff --git a/rpms/awips2.core/Installer.ncep-database/component.spec b/rpms/awips2.core/Installer.ncep-database/component.spec index bb49720003..fd6585a691 100644 --- a/rpms/awips2.core/Installer.ncep-database/component.spec +++ b/rpms/awips2.core/Installer.ncep-database/component.spec @@ -19,9 +19,8 @@ Packager: %{_build_site} AutoReq: no Provides: awips2-ncep-database -Requires: awips2-database -Requires: awips2-postgresql -Requires: awips2-psql +Requires: perl +Requires: awips2-database, awips2-postgresql, awips2-psql %description AWIPS II NCEP Database Installation - This rpm creates the ncep database and tables. diff --git a/rpms/awips2.upc/Installer.ldm/component.spec b/rpms/awips2.upc/Installer.ldm/component.spec index 0d75990af1..698404ad6c 100644 --- a/rpms/awips2.upc/Installer.ldm/component.spec +++ b/rpms/awips2.upc/Installer.ldm/component.spec @@ -23,7 +23,7 @@ AutoReq: no Requires: awips2 Requires: awips2-qpid-lib Requires: awips2-python -Requires: pax, gcc, libtool, make +Requires: perl, pax, gcc, libtool, make Requires: libxml2-devel, libpng-devel, boost-program-options Provides: awips2-ldm BuildRequires: awips2-python