spec file include dist in generated rpm

Conflicts:
	rpms/awips2.core/Installer.localapps-environment/component.spec
This commit is contained in:
mjames-upc 2017-04-24 15:16:20 -06:00
parent d1cc55801d
commit bfaffd9ba4
28 changed files with 31 additions and 27 deletions

View file

@ -10,7 +10,7 @@
Name: awips2-eclipse Name: awips2-eclipse
Summary: AWIPS II Eclipse Distribution Summary: AWIPS II Eclipse Distribution
Version: 3.8.2 Version: 3.8.2
Release: 1 Release: 1%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: %{_build_root} BuildRoot: %{_build_root}
URL: N/A URL: N/A

View file

@ -10,7 +10,7 @@
Name: awips2-alertviz Name: awips2-alertviz
Summary: AWIPS II AlertViz Summary: AWIPS II AlertViz
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: %{_build_root} BuildRoot: %{_build_root}
URL: N/A URL: N/A

View file

@ -10,7 +10,7 @@
Name: %{_component_name} Name: %{_component_name}
Summary: %{_component_name} Installation Summary: %{_component_name} Installation
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
URL: N/A URL: N/A

View file

@ -14,7 +14,7 @@
Name: %{_component_name} Name: %{_component_name}
Summary: awips2-cave-wrapper Installation Summary: awips2-cave-wrapper Installation
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
URL: N/A URL: N/A

View file

@ -22,7 +22,7 @@
Name: %{_component_name} Name: %{_component_name}
Summary: awips2-cave Installation Summary: awips2-cave Installation
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
URL: N/A URL: N/A

View file

@ -4,7 +4,7 @@
Name: awips2-adapt-native Name: awips2-adapt-native
Summary: AWIPS II Adapt Native Distribution Summary: AWIPS II Adapt Native Distribution
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch

View file

@ -4,7 +4,7 @@
Name: awips2-aviation-shared Name: awips2-aviation-shared
Summary: AWIPS II Aviation Distribution Summary: AWIPS II Aviation Distribution
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch

View file

@ -7,7 +7,7 @@
Name: %{_component_name} Name: %{_component_name}
Summary: AWIPS II CLI Installation Summary: AWIPS II CLI Installation
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch

View file

@ -10,7 +10,7 @@
Name: awips2-common-base Name: awips2-common-base
Summary: AWIPS II Edex Summary: AWIPS II Edex
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: %{_build_root} BuildRoot: %{_build_root}
BuildArch: %{_build_arch} BuildArch: %{_build_arch}

View file

@ -5,7 +5,7 @@
Name: awips2-edex-environment Name: awips2-edex-environment
Summary: awips2-edex-environment Summary: awips2-edex-environment
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: %{_build_root} BuildRoot: %{_build_root}
BuildArch: noarch BuildArch: noarch

View file

@ -4,7 +4,7 @@
Name: awips2-data.gfe Name: awips2-data.gfe
Summary: AWIPS II gfe Distribution Summary: AWIPS II gfe Distribution
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
# We default the buildroot to determine whether or not the user has # We default the buildroot to determine whether or not the user has
# specified the buildroot. # specified the buildroot.

View file

@ -4,7 +4,7 @@
Name: awips2-gfesuite-client Name: awips2-gfesuite-client
Summary: AWIPS II gfesuite client Installation Summary: AWIPS II gfesuite client Installation
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch

View file

@ -4,7 +4,7 @@
Name: awips2-gfesuite-server Name: awips2-gfesuite-server
Summary: AWIPS II gfesuite server Installation Summary: AWIPS II gfesuite server Installation
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch

View file

@ -5,7 +5,7 @@
Name: awips2-groovy Name: awips2-groovy
Summary: AWIPS II Groovy Distribution Summary: AWIPS II Groovy Distribution
Version: %{_groovy_version} Version: %{_groovy_version}
Release: 1 Release: 1%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: %{_build_root} BuildRoot: %{_build_root}
BuildArch: noarch BuildArch: noarch

View file

@ -6,7 +6,7 @@
Name: %{_component_name} Name: %{_component_name}
Summary: AWIPS II Hydroapps Distribution Summary: AWIPS II Hydroapps Distribution
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
URL: N/A URL: N/A

View file

@ -4,7 +4,7 @@
Name: awips2-irt Name: awips2-irt
Summary: AWIPS II IRT Installation Summary: AWIPS II IRT Installation
Version: 1.0.0 Version: 1.0.0
Release: 1 Release: 1%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
Prefix: /irt Prefix: /irt

View file

@ -4,7 +4,7 @@
Name: %{_component_name} Name: %{_component_name}
Summary: AWIPS II Localization Installation Summary: AWIPS II Localization Installation
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch
@ -426,6 +426,9 @@ if [ $? -ne 0 ]; then
fi fi
echo "INFO: NHAdomain and StormSurgeWW shapefiles were successfully imported." >> ${log_file} echo "INFO: NHAdomain and StormSurgeWW shapefiles were successfully imported." >> ${log_file}
#PSQL="/awips2/psql/bin/psql"
#echo "Adding KLGX to metadata.radar_spatial from common_static/base/radar/radar_add_klgx.sql"
#${PSQL} -U awips -d metadata -q -f /awips2/edex/data/utility/common_static/base/radar/radar_add_klgx.sql >> ${log_file} 2>&1
a2_pg_ctl="/awips2/postgresql/bin/pg_ctl" a2_pg_ctl="/awips2/postgresql/bin/pg_ctl"
# if we started PostgreSQL, shutdown PostgreSQL # if we started PostgreSQL, shutdown PostgreSQL

View file

@ -0,0 +1 @@
INSERT INTO radar_spatial ("rda_id","rpg_id_dec","immutablex","wfo_id","eqp_elv","name","lon","lat","elevmeter",the_geom) VALUES ('KLGX','870','666.0000','LGX','337.9000','Grays Harbor','-124.1069','47.1158','103',ST_GeomFromText('POINT(-124.1069 47.1158)',4326) );

View file

@ -6,7 +6,7 @@
Name: %{_component_name} Name: %{_component_name}
Summary: AWIPS II Maps Database Summary: AWIPS II Maps Database
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch

View file

@ -6,7 +6,7 @@
Name: awips2-ncep-database Name: awips2-ncep-database
Summary: AWIPS II NCEP Database Installation Summary: AWIPS II NCEP Database Installation
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch

View file

@ -16,7 +16,7 @@
Name: %{_component_name} Name: %{_component_name}
Summary: AWIPS II Notification Summary: AWIPS II Notification
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: %{_build_arch} BuildArch: %{_build_arch}

View file

@ -4,7 +4,7 @@
Name: awips2-pypies Name: awips2-pypies
Summary: AWIPS II PyPIES Summary: AWIPS II PyPIES
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
URL: N/A URL: N/A

View file

@ -7,7 +7,7 @@
Name: %{_component_name} Name: %{_component_name}
Summary: AWIPS II Radar Server Summary: AWIPS II Radar Server
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
Prefix: %{_component_default_prefix} Prefix: %{_component_default_prefix}

View file

@ -10,7 +10,7 @@
Name: awips2-rehost-support-postgresql Name: awips2-rehost-support-postgresql
Summary: AWIPS II Rehost Support (PostgreSQL) Summary: AWIPS II Rehost Support (PostgreSQL)
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildArch: noarch BuildArch: noarch
URL: N/A URL: N/A

View file

@ -4,7 +4,7 @@
Name: awips2-data.hdf5-topo Name: awips2-data.hdf5-topo
Summary: AWIPS II Topo Distribution Summary: AWIPS II Topo Distribution
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch

View file

@ -16,7 +16,7 @@
Name: %{_component_name} Name: %{_component_name}
Summary: awips2 Installation Summary: awips2 Installation
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch

View file

@ -4,7 +4,7 @@
Name: awips2-edex-shapefiles Name: awips2-edex-shapefiles
Summary: AWIPS II Edex Summary: AWIPS II Edex
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: %{_build_root} BuildRoot: %{_build_root}
BuildArch: noarch BuildArch: noarch

View file

@ -5,7 +5,7 @@
Name: awips2-edex-upc Name: awips2-edex-upc
Summary: AWIPS II UPC EDEX Tools Summary: AWIPS II UPC EDEX Tools
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}%{?dist}
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
URL: N/A URL: N/A