From 87274793301375d4c083c1f703e2f447775207e2 Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Tue, 23 Apr 2013 12:00:50 -0500
Subject: [PATCH] Issue #1938 - install the postgis legacy functions for the
 metadata and maps database during installation.

- accept DR for work

Change-Id: Ib19064e3a1ea446b3325979d816924a0f1a45b63

Former-commit-id: d952acce9ec1bc209917783798d467ed65a8e5b7 [formerly b3974dfe622b621ee8fd9951bd03fa392ea0c09d] [formerly 87d0aa17a08f6f051979efe510f77fb1d4774700] [formerly d952acce9ec1bc209917783798d467ed65a8e5b7 [formerly b3974dfe622b621ee8fd9951bd03fa392ea0c09d] [formerly 87d0aa17a08f6f051979efe510f77fb1d4774700] [formerly 99d74e39eae077751476933b8c229bb897175e2f [formerly 87d0aa17a08f6f051979efe510f77fb1d4774700 [formerly d90b1203df064a6461ad058a6c08e96d1ee7fd43]]]]
Former-commit-id: 99d74e39eae077751476933b8c229bb897175e2f
Former-commit-id: 86c3608556637faed71083fadd2576e00a458119 [formerly 5018b12ec6ad02ce5ddc056ee53c98f49f27f0b4] [formerly 902bfaf757e001eb1dda53036390c2af04f35d17 [formerly 4dedf0b1eb1315c96407f2f436731ddc9555351b]]
Former-commit-id: 46d4ec87abcae7bd4c5031b3c21b75dc6968f6d1 [formerly 4b6140cc7668ef8a7de325ffee66eb53fbe765ae]
Former-commit-id: 578e4c3fb26662e6b35ac1d79c34bba6a36832a8
---
 rpms/awips2.core/Installer.database/component.spec      | 3 ++-
 rpms/awips2.core/Installer.maps-database/component.spec | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/rpms/awips2.core/Installer.database/component.spec b/rpms/awips2.core/Installer.database/component.spec
index d59fad8360..14c75adb68 100644
--- a/rpms/awips2.core/Installer.database/component.spec
+++ b/rpms/awips2.core/Installer.database/component.spec
@@ -269,6 +269,7 @@ execute_initial_sql_script ${SQL_SHARE_DIR}/initial_setup_server.sql
 execute_psql_sql_script /awips2/postgresql/share/contrib/postgis-2.0/postgis.sql metadata
 execute_psql_sql_script /awips2/postgresql/share/contrib/postgis-2.0/spatial_ref_sys.sql metadata
 execute_psql_sql_script /awips2/postgresql/share/contrib/postgis-2.0/rtpostgis.sql metadata
+execute_psql_sql_script /awips2/postgresql/share/contrib/postgis-2.0/legacy.sql metadata
 execute_psql_sql_script ${SQL_SHARE_DIR}/permissions.sql metadata
 execute_psql_sql_script ${SQL_SHARE_DIR}/create_subscription_tables.sql metadata
 execute_psql_sql_script ${SQL_SHARE_DIR}/fxatext.sql metadata
@@ -307,4 +308,4 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(755,awips,fxalpha,755)
 %dir /awips2/database/sqlScripts/share/sql
 /awips2/database/sqlScripts/share/sql/*.sql
-/awips2/database/sqlScripts/share/sql/*.sh
\ No newline at end of file
+/awips2/database/sqlScripts/share/sql/*.sh
diff --git a/rpms/awips2.core/Installer.maps-database/component.spec b/rpms/awips2.core/Installer.maps-database/component.spec
index b5204fbf66..5e1a307ea8 100644
--- a/rpms/awips2.core/Installer.maps-database/component.spec
+++ b/rpms/awips2.core/Installer.maps-database/component.spec
@@ -189,6 +189,13 @@ if [ "${MAPS_DB_EXISTS}" = "false" ]; then
       printFailureMessage
    fi
 
+   SQL_FILE="/awips2/postgresql/share/contrib/postgis-2.0/legacy.sql"
+   su ${DB_OWNER} -c \
+      "${PSQL} -d maps -U awips -q -p 5432 -f ${SQL_FILE}" >> ${SQL_LOG} 2>&1
+   if [ $? -ne 0 ]; then
+      printFailureMessage
+   fi
+
    # Import the data into the maps database.
    DB_ARCHIVE="/awips2/database/sqlScripts/share/sql/maps/maps.db"
    su ${DB_OWNER} -c \
@@ -322,4 +329,4 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(755,awips,fxalpha,755)
 /awips2/database/sqlScripts/share/sql/maps/*.sh
 /awips2/database/sqlScripts/share/sql/maps/*.db
-/awips2/database/sqlScripts/share/sql/maps/*.sql
\ No newline at end of file
+/awips2/database/sqlScripts/share/sql/maps/*.sql