From 8a31830def0183b5b88f621b21f658780a148760 Mon Sep 17 00:00:00 2001 From: David Friedman Date: Wed, 4 Feb 2015 19:56:47 +0000 Subject: [PATCH 1/2] ASM #17009 - Add Guam to countyTypes.txt file to account for "no counties" Change-Id: Ic8dc2519b1cfb35bf3a2e0d8d61c007e108429a8 Former-commit-id: d1b3f2a5f474ddacb4bb91fae899cc28c6925569 [formerly 61ee73806f184b0d4092b8474f18b3525d92a20b] Former-commit-id: beb5074ddde433b9f848bc8a66cf0925e54553a7 --- .../utility/common_static/base/warngen/countyTypes.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/countyTypes.txt b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/countyTypes.txt index db029789d7..2b9c59ef48 100755 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/countyTypes.txt +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/countyTypes.txt @@ -14,6 +14,10 @@ PR \ MUNICIPALITY PUERTO RICO \ MUNICIPALITY PR+ \ MUNICIPALITIES PUERTO RICO+ \ MUNICIPALITIES +GU \ +GUAM \ +GU+ \ +GUAM+ \ DEFAULT+ \ COUNTIES DEFAULT \ COUNTY CITY \ \ No newline at end of file From f4cd41e2f63265b8888fb22cfcfefe40c62cdf9f Mon Sep 17 00:00:00 2001 From: "Shawn.Hooper" Date: Wed, 4 Feb 2015 16:45:06 -0500 Subject: [PATCH 2/2] ASM #15311 - Update pgadmin spec file to allow for postgresql version greater than or equal to 8.4.13-1 and customTargets.xml for EDEX to allow for flexible feature files. Change-Id: I9cf47aff9c6fa874ffe3d2e8bbbba2871abacec2 Former-commit-id: 915ddd6964fd23bfab739f40ea01b9e71e2819bd [formerly f1383bbdbadc54f8f2a0384d319c70160464a3ac] Former-commit-id: a98b54a9440485ca3e3a60d16a2568aaddf73d33 --- edexOsgi/build.edex/edex/customTargets.xml | 6 ++++++ rpms/awips2.core/Installer.pgadmin/component.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/edexOsgi/build.edex/edex/customTargets.xml b/edexOsgi/build.edex/edex/customTargets.xml index d848fb0603..db764310a0 100644 --- a/edexOsgi/build.edex/edex/customTargets.xml +++ b/edexOsgi/build.edex/edex/customTargets.xml @@ -278,6 +278,12 @@ input="${edex.component}" regexp="com-raytheon-uf-(.+)-feature" select="\1" /> + + diff --git a/rpms/awips2.core/Installer.pgadmin/component.spec b/rpms/awips2.core/Installer.pgadmin/component.spec index 1a3c10495e..b6d0355144 100644 --- a/rpms/awips2.core/Installer.pgadmin/component.spec +++ b/rpms/awips2.core/Installer.pgadmin/component.spec @@ -21,9 +21,9 @@ Packager: Bryan Kowal AutoReq: no BuildRequires: awips2-postgresql = 9.2.3-1.el6 -BuildRequires: postgresql = 8.4.13-1.el6_3 -BuildRequires: postgresql-devel = 8.4.13-1.el6_3 -BuildRequires: postgresql-libs = 8.4.13-1.el6_3 +BuildRequires: postgresql >= 8.4.13-1.el6_3 +BuildRequires: postgresql-devel >= 8.4.13-1.el6_3 +BuildRequires: postgresql-libs >= 8.4.13-1.el6_3 BuildRequires: wxGTK >= 2.8.12-1 BuildRequires: wxGTK-devel >= 2.8.12-1