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

Merge "Omaha #3216 - update postgres to use geos 3.4.2" into omaha_14.4.1

Browse source 
Former-commit-id: 06b0bc78e4 [formerly ac92e7a1fd] [formerly de088ca65b] [formerly 06b0bc78e4 [formerly ac92e7a1fd] [formerly de088ca65b] [formerly 180a1cb4f2 [formerly de088ca65b [formerly e524cc13694ea30fdb7ab1d8879218be4650fed6]]]]
Former-commit-id: 180a1cb4f2
Former-commit-id: b245a21603 [formerly aff37e4517] [formerly 4b384b16589d587839871c4c7db11c9e6409f4b4 [formerly e4893b65d7]]
Former-commit-id: 446dc48ef0086e74f1331f86e185845cd740da46 [formerly 4cf0c5d0f4]
Former-commit-id: 37b95a1466
This commit is contained in:
Greg Armendariz 2014-12-05 08:46:03 -06:00 • committed by Gerrit Code Review
commit 716a8379de
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
rpms/awips2.core/Installer.postgres/SOURCES/geos-3.3.6.tar.bz2
View file

Binary file not shown.

9
rpms/awips2.core/Installer.postgres/component.spec
View file

@ -8,7 +8,7 @@
Name: awips2-postgresql
Summary: AWIPS II PostgreSQL Distribution
Version: %{_postgresql_version}
Release: 2.el6
Release: 3.el6
Group: AWIPSII
BuildRoot: %{_build_root}
BuildArch: %{_build_arch}
@ -148,18 +148,19 @@ fi
SRC_DIR="%{_baseline_workspace}/rpms/awips2.core/Installer.postgres/SOURCES"
PROJ_SRC="proj-4.8.0.zip"
POSTGIS_SRC="postgis-2.0.6.tar.gz"
GEOS_SRC="geos-3.3.6.tar.bz2"
GEOS_BASE="geos-3.4.2"
GEOS_SRC="geos-3.4.2.tar.bz2"
GDAL_SRC="gdal192.zip"
# The directory that the src will be in after the tars are unzipped.
PROJ_SRC_DIR="proj-4.8.0"
POSTGIS_SRC_DIR="postgis-2.0.6"
GEOS_SRC_DIR="geos-3.3.6"
GEOS_SRC_DIR="geos-3.4.2"
GDAL_SRC_DIR="gdal-1.9.2"
cp ${SRC_DIR}/${POSTGIS_SRC} %{_postgres_build_loc}
cp ${SRC_DIR}/${PROJ_SRC} %{_postgres_build_loc}
cp ${SRC_DIR}/${GEOS_SRC} %{_postgres_build_loc}
cp %{_baseline_workspace}/foss/${GEOS_BASE}/packaged/${GEOS_SRC} %{_postgres_build_loc}
cp ${SRC_DIR}/${GDAL_SRC} %{_postgres_build_loc}
cd %{_postgres_build_loc}