From 10fd784dd796970e1a1483d1a5d94ec2a781b4ae Mon Sep 17 00:00:00 2001
From: Brian Graham <brian.graham@noaa.gov>
Date: Mon, 8 Dec 2014 15:15:05 -0500
Subject: [PATCH] ASM #15662 - Updated spec files to include AWIPS version

Change-Id: If8f78761550355a1ec55b6abde594583821d4d9f

Former-commit-id: 99143e00457f76acace863b3e822fc68bc3a5c8f [formerly 99143e00457f76acace863b3e822fc68bc3a5c8f [formerly 11741b03db9424aa10086553729303fa23a7366f]]
Former-commit-id: e1b4c4abe3fc0ea1506a0dc05d9cfd8b77707f48
Former-commit-id: 24ca44265175b8d5aacc3f1821ece236b01eef8b
---
 rpms/awips2.core/Installer.ant/component.spec                 | 2 +-
 rpms/awips2.core/Installer.groovy/component.spec              | 2 +-
 rpms/awips2.core/Installer.java/1.7/component.spec            | 2 +-
 rpms/awips2.core/Installer.pgadmin/component.spec             | 2 +-
 rpms/awips2.core/Installer.postgres/component.spec            | 2 +-
 rpms/awips2.core/Installer.python/component.spec              | 2 +-
 rpms/awips2.core/Installer.tools/component.spec               | 2 +-
 rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0             | 2 +-
 rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec                     | 2 +-
 rpms/python.site-packages/Installer.cherrypy/component.spec   | 2 +-
 rpms/python.site-packages/Installer.h5py/component.spec       | 2 +-
 rpms/python.site-packages/Installer.matplotlib/component.spec | 2 +-
 rpms/python.site-packages/Installer.nose/component.spec       | 2 +-
 rpms/python.site-packages/Installer.numpy/component.spec      | 2 +-
 rpms/python.site-packages/Installer.pil/component.spec        | 4 ++--
 rpms/python.site-packages/Installer.pmw/component.spec        | 2 +-
 rpms/python.site-packages/Installer.pupynere/component.spec   | 2 +-
 rpms/python.site-packages/Installer.pycairo/component.spec    | 2 +-
 rpms/python.site-packages/Installer.pygtk/component.spec      | 2 +-
 rpms/python.site-packages/Installer.qpid/component.spec       | 2 +-
 rpms/python.site-packages/Installer.scientific/component.spec | 2 +-
 rpms/python.site-packages/Installer.scipy/component.spec      | 2 +-
 rpms/python.site-packages/Installer.shapely/component.spec    | 2 +-
 rpms/python.site-packages/Installer.tables/component.spec     | 2 +-
 rpms/python.site-packages/Installer.thrift/component.spec     | 2 +-
 rpms/python.site-packages/Installer.tpg/component.spec        | 2 +-
 rpms/python.site-packages/Installer.werkzeug/component.spec   | 2 +-
 27 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/rpms/awips2.core/Installer.ant/component.spec b/rpms/awips2.core/Installer.ant/component.spec
index 13331c38bb..f203b39e7c 100644
--- a/rpms/awips2.core/Installer.ant/component.spec
+++ b/rpms/awips2.core/Installer.ant/component.spec
@@ -5,7 +5,7 @@
 Name: awips2-ant
 Summary: AWIPS II Ant Distribution
 Version: 1.7.1
-Release: 3
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
diff --git a/rpms/awips2.core/Installer.groovy/component.spec b/rpms/awips2.core/Installer.groovy/component.spec
index 6e09878c2f..2e43232098 100644
--- a/rpms/awips2.core/Installer.groovy/component.spec
+++ b/rpms/awips2.core/Installer.groovy/component.spec
@@ -5,7 +5,7 @@
 Name: awips2-groovy
 Summary: AWIPS II Groovy Distribution
 Version: %{_groovy_version}
-Release: 1
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
diff --git a/rpms/awips2.core/Installer.java/1.7/component.spec b/rpms/awips2.core/Installer.java/1.7/component.spec
index 4e2a72a1f8..9f39d03ef8 100644
--- a/rpms/awips2.core/Installer.java/1.7/component.spec
+++ b/rpms/awips2.core/Installer.java/1.7/component.spec
@@ -11,7 +11,7 @@
 Name: awips2-java
 Summary: AWIPS II Java Distribution
 Version: %{_java_version}
-Release: 1
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/awips2.core/Installer.pgadmin/component.spec b/rpms/awips2.core/Installer.pgadmin/component.spec
index e277cda345..1a3c10495e 100644
--- a/rpms/awips2.core/Installer.pgadmin/component.spec
+++ b/rpms/awips2.core/Installer.pgadmin/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-pgadmin3
 Summary: AWIPS II pgadmin3 Distribution
 Version: %{_pgadmin3_version}
-Release: 1.el6
+Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/awips2.core/Installer.postgres/component.spec b/rpms/awips2.core/Installer.postgres/component.spec
index 62193d2325..217df4f910 100644
--- a/rpms/awips2.core/Installer.postgres/component.spec
+++ b/rpms/awips2.core/Installer.postgres/component.spec
@@ -8,7 +8,7 @@
 Name: awips2-postgresql
 Summary: AWIPS II PostgreSQL Distribution
 Version: %{_postgresql_version}
-Release: 1.el6
+Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/awips2.core/Installer.python/component.spec b/rpms/awips2.core/Installer.python/component.spec
index f48d1fbfd9..5cf4fcf46a 100644
--- a/rpms/awips2.core/Installer.python/component.spec
+++ b/rpms/awips2.core/Installer.python/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python
 Summary: AWIPS II Python Distribution
 Version: 2.7.1
-Release: 11.el6
+Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/awips2.core/Installer.tools/component.spec b/rpms/awips2.core/Installer.tools/component.spec
index b3d5e007f3..664c7e9c06 100644
--- a/rpms/awips2.core/Installer.tools/component.spec
+++ b/rpms/awips2.core/Installer.tools/component.spec
@@ -8,7 +8,7 @@
 Name: awips2-tools
 Summary: AWIPS II Tools Distribution
 Version: 1.8.5
-Release: 2.el6
+Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
 BuildRequires: awips2-python-h5py
 BuildRoot: /tmp
diff --git a/rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0 b/rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
index 2353119583..9d08dd26ea 100644
--- a/rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
+++ b/rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
@@ -14,7 +14,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
 ! 
 ! Name:           awips2-qpid-java
   Version:        0.18
-! Release:        5%{?dist}
+! Release:        %{_component_version}.%{_component_release}%{?dist}
   Summary:        Java implementation of Apache Qpid
   License:        Apache Software License
   Group:          Development/Java
diff --git a/rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec b/rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
index bc14be38d6..7d6c4ab02a 100644
--- a/rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
+++ b/rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
@@ -9,7 +9,7 @@
 Name: awips2-qpid-lib
 Summary: AWIPS II QPID Native Library Distribution
 Version: %{_qpid_version}
-Release: 1.el6
+Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/python.site-packages/Installer.cherrypy/component.spec b/rpms/python.site-packages/Installer.cherrypy/component.spec
index 32ba0a3f1c..e4f127c464 100644
--- a/rpms/python.site-packages/Installer.cherrypy/component.spec
+++ b/rpms/python.site-packages/Installer.cherrypy/component.spec
@@ -8,7 +8,7 @@
 Name: awips2-python-cherrypy
 Summary: AWIPS II Python cherrypy Site-Package
 Version: 3.1.2
-Release: 3
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
diff --git a/rpms/python.site-packages/Installer.h5py/component.spec b/rpms/python.site-packages/Installer.h5py/component.spec
index e86ddfa981..ee361d6015 100644
--- a/rpms/python.site-packages/Installer.h5py/component.spec
+++ b/rpms/python.site-packages/Installer.h5py/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-h5py
 Summary: AWIPS II Python h5py Distribution
 Version: 1.3.0
-Release: 3.el6
+Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/python.site-packages/Installer.matplotlib/component.spec b/rpms/python.site-packages/Installer.matplotlib/component.spec
index ecd40e3a13..ac934169e9 100644
--- a/rpms/python.site-packages/Installer.matplotlib/component.spec
+++ b/rpms/python.site-packages/Installer.matplotlib/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-matplotlib
 Summary: AWIPS II Python matplotlib Distribution
 Version: 0.99.1.1
-Release: 3.el6
+Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/python.site-packages/Installer.nose/component.spec b/rpms/python.site-packages/Installer.nose/component.spec
index f49bf55b7d..dfc54065b9 100644
--- a/rpms/python.site-packages/Installer.nose/component.spec
+++ b/rpms/python.site-packages/Installer.nose/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-nose
 Summary: AWIPS II Python nose Distribution
 Version: 0.11.1
-Release: 3
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
diff --git a/rpms/python.site-packages/Installer.numpy/component.spec b/rpms/python.site-packages/Installer.numpy/component.spec
index 5b138ca832..6a045a369c 100644
--- a/rpms/python.site-packages/Installer.numpy/component.spec
+++ b/rpms/python.site-packages/Installer.numpy/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-numpy
 Summary: AWIPS II Python numpy Distribution
 Version: 1.5.0
-Release: 3.el6.p1
+Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/python.site-packages/Installer.pil/component.spec b/rpms/python.site-packages/Installer.pil/component.spec
index 4b44639a79..a455fa1dfc 100644
--- a/rpms/python.site-packages/Installer.pil/component.spec
+++ b/rpms/python.site-packages/Installer.pil/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-pil
 Summary: AWIPS II Python pil Distribution
 Version: 1.1.6
-Release: 3.el6
+Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
@@ -89,4 +89,4 @@ rm -rf %{_python_build_loc}
 /awips2/python/lib/python2.7/site-packages/*
 %defattr(755,awips,fxalpha,755)
 %dir /awips2/python/bin
-/awips2/python/bin/*
\ No newline at end of file
+/awips2/python/bin/*
diff --git a/rpms/python.site-packages/Installer.pmw/component.spec b/rpms/python.site-packages/Installer.pmw/component.spec
index c69413066e..bc5ef2c303 100644
--- a/rpms/python.site-packages/Installer.pmw/component.spec
+++ b/rpms/python.site-packages/Installer.pmw/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-pmw
 Summary: AWIPS II Python pmw Distribution
 Version: 1.3.2
-Release: 3
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/python.site-packages/Installer.pupynere/component.spec b/rpms/python.site-packages/Installer.pupynere/component.spec
index 2444d7c0b4..bfd63b3229 100644
--- a/rpms/python.site-packages/Installer.pupynere/component.spec
+++ b/rpms/python.site-packages/Installer.pupynere/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-pupynere
 Summary: AWIPS II Python pupynere Distribution
 Version: 1.0.13
-Release: 3
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
diff --git a/rpms/python.site-packages/Installer.pycairo/component.spec b/rpms/python.site-packages/Installer.pycairo/component.spec
index 4a194e8c6c..958722c783 100644
--- a/rpms/python.site-packages/Installer.pycairo/component.spec
+++ b/rpms/python.site-packages/Installer.pycairo/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-pycairo
 Summary: AWIPS II Python pycairo Distribution
 Version: 1.2.2
-Release: 3
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/python.site-packages/Installer.pygtk/component.spec b/rpms/python.site-packages/Installer.pygtk/component.spec
index 549250d389..13fc8e0484 100644
--- a/rpms/python.site-packages/Installer.pygtk/component.spec
+++ b/rpms/python.site-packages/Installer.pygtk/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-pygtk
 Summary: AWIPS II Python pygtk Distribution
 Version: 2.8.6
-Release: 3
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/python.site-packages/Installer.qpid/component.spec b/rpms/python.site-packages/Installer.qpid/component.spec
index 44e489223d..2a79de4d27 100644
--- a/rpms/python.site-packages/Installer.qpid/component.spec
+++ b/rpms/python.site-packages/Installer.qpid/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-qpid
 Summary: AWIPS II Python qpid Distribution
 Version: 0.18
-Release: 1
+Release: %{_component_version}.%{_component_release}
 BuildArch: noarch
 Group: AWIPSII
 BuildRoot: %{_build_root}
diff --git a/rpms/python.site-packages/Installer.scientific/component.spec b/rpms/python.site-packages/Installer.scientific/component.spec
index a179d93eb5..c0e9154d51 100644
--- a/rpms/python.site-packages/Installer.scientific/component.spec
+++ b/rpms/python.site-packages/Installer.scientific/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-scientific
 Summary: AWIPS II Python scientific Distribution
 Version: 2.8
-Release: 3.el6
+Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/python.site-packages/Installer.scipy/component.spec b/rpms/python.site-packages/Installer.scipy/component.spec
index 54d34dfdd8..35658b883e 100644
--- a/rpms/python.site-packages/Installer.scipy/component.spec
+++ b/rpms/python.site-packages/Installer.scipy/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-scipy
 Summary: AWIPS II Python scipy Distribution
 Version: 0.8.0
-Release: 3.el6
+Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/python.site-packages/Installer.shapely/component.spec b/rpms/python.site-packages/Installer.shapely/component.spec
index 95bdceed2f..4a38a91261 100644
--- a/rpms/python.site-packages/Installer.shapely/component.spec
+++ b/rpms/python.site-packages/Installer.shapely/component.spec
@@ -10,7 +10,7 @@
 Name: awips2-python-shapely
 Summary: AWIPS II Python shapely Distribution
 Version: 1.2.16
-Release: 1
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/python.site-packages/Installer.tables/component.spec b/rpms/python.site-packages/Installer.tables/component.spec
index 5775486d47..be855fa1f1 100644
--- a/rpms/python.site-packages/Installer.tables/component.spec
+++ b/rpms/python.site-packages/Installer.tables/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-tables
 Summary: AWIPS II Python tables Distribution
 Version: 2.1.2
-Release: 3.el6
+Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
diff --git a/rpms/python.site-packages/Installer.thrift/component.spec b/rpms/python.site-packages/Installer.thrift/component.spec
index 0620ffb816..ac90cc7f6f 100644
--- a/rpms/python.site-packages/Installer.thrift/component.spec
+++ b/rpms/python.site-packages/Installer.thrift/component.spec
@@ -8,7 +8,7 @@
 Name: awips2-python-thrift
 Summary: AWIPS II Python thrift Distribution
 Version: 20080411p1
-Release: 3
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
diff --git a/rpms/python.site-packages/Installer.tpg/component.spec b/rpms/python.site-packages/Installer.tpg/component.spec
index 1aaf7cf3f1..229149b4ef 100644
--- a/rpms/python.site-packages/Installer.tpg/component.spec
+++ b/rpms/python.site-packages/Installer.tpg/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-tpg
 Summary: AWIPS II Python tpg Distribution
 Version: 3.1.2
-Release: 3
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
diff --git a/rpms/python.site-packages/Installer.werkzeug/component.spec b/rpms/python.site-packages/Installer.werkzeug/component.spec
index faf3f04c95..af5dbd6782 100644
--- a/rpms/python.site-packages/Installer.werkzeug/component.spec
+++ b/rpms/python.site-packages/Installer.werkzeug/component.spec
@@ -9,7 +9,7 @@
 Name: awips2-python-werkzeug
 Summary: AWIPS II Python werkzeug Distribution
 Version: 3.1.2
-Release: 3
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch