Merge branch 'unidata_15.1.1' of github.com:Unidata/awips2 into unidata_15.1.1

Former-commit-id: 169b7d1b4c

rpms/awips2.core/Installer.httpd-pypies/component.spec

@@ -7,7 +7,7 @@
 Summary: Pypies Apache HTTP Server
 Name: awips2-httpd-pypies
 Version: 2.2.15
-Release: 15.9
+Release: 15.10
 URL: http://httpd.apache.org/
 Source0: http://archive.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html

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: 4
+Release: 5
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
@@ -173,6 +173,7 @@ popd > /dev/null
 rm -rf ${HDF5_PATH}
 
 %pre
+rm -rf /awips2/python/lib/python2.7/site-packages/h5py*
 
 %post