xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source 
Change-Id: I9cf47aff9c6fa874ffe3d2e8bbbba2871abacec2

Former-commit-id: f1383bbdbadc54f8f2a0384d319c70160464a3ac
This commit is contained in:
Shawn.Hooper 2015-02-04 16:45:06 -05:00
parent beb5074ddd
commit a98b54a944
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
edexOsgi/build.edex/edex/customTargets.xml
View file

@ -279,6 +279,12 @@
regexp="com-raytheon-uf-(.+)-feature"
select="\1" />
<propertyregex property="edex.component"
override="true"
input="${edex.component}"
regexp="^(?:edu|gov)-.*(edex-.+)-feature"
select="\1" />
<!-- Create the distribution directory. -->
<mkdir dir="${builder}/dist" />
<zip destfile="${builder}/dist/${edex.component}.zip"

6
rpms/awips2.core/Installer.pgadmin/component.spec
View file

@ -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