diff --git a/traffic_ops/build/build_rpm.sh b/traffic_ops/build/build_rpm.sh index 96043dedaf..126cb2a6fe 100755 --- a/traffic_ops/build/build_rpm.sh +++ b/traffic_ops/build/build_rpm.sh @@ -111,8 +111,9 @@ initBuildArea() { cp "$TO_DIR"/build/traffic_ops.spec "$RPMBUILD"/SPECS/. || \ { echo "Could not copy spec files: $?"; return 1; } + source "${TC_DIR}/.env" PLUGINS="$(grep -l 'AddPlugin(' "${TO_DIR}/traffic_ops_golang/plugin/"*.go | grep -v 'func AddPlugin(' | xargs -I '{}' basename {} '.go')" - export PLUGINS + export POSTGRES_VERSION PLUGINS echo "The build area has been initialized." } diff --git a/traffic_ops/build/traffic_ops.spec b/traffic_ops/build/traffic_ops.spec index 536e95074e..53fb0d94f6 100644 --- a/traffic_ops/build/traffic_ops.spec +++ b/traffic_ops/build/traffic_ops.spec @@ -21,6 +21,7 @@ %define TRAFFIC_OPS_LOG_DIR /var/log/traffic_ops %define TRAFFIC_OPS_ROOT_CERTIFICATES_DIR /var/log/traffic_ops %define debug_package %{nil} +%define postgres_version %{getenv:POSTGRES_VERSION} Summary: Traffic Ops Name: traffic_ops @@ -36,7 +37,7 @@ AutoReqProv: no Requires: cpanminus, expat-devel, libcurl, libpcap-devel, mkisofs, tar Requires: openssl-devel, perl, perl-core, perl-DBD-Pg, perl-DBI, perl-Digest-SHA1 Requires: libidn-devel, libcurl-devel, libcap -Requires: postgresql13 >= 13.2 +Requires: postgresql13 >= %{postgres_version} Requires: perl-JSON, perl-libwww-perl, perl-Test-CPAN-Meta, perl-WWW-Curl, perl-TermReadKey, perl-Crypt-ScryptKDF Requires: python3 Requires(pre): /usr/sbin/useradd, /usr/bin/getent