From b61e6b3ffab01bcf68bf1197e9107884a4b1d616 Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@unidata.ucar.edu>
Date: Sun, 3 Jan 2016 12:38:48 -0700
Subject: [PATCH] h5py preuninstall force remove to solve this cpio: rename
 error on rpm update

---
 edexOsgi/build.edex/build.xml                           | 8 ++++----
 rpms/awips2.core/Installer.httpd-pypies/component.spec  | 2 +-
 rpms/python.site-packages/Installer.h5py/component.spec | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/edexOsgi/build.edex/build.xml b/edexOsgi/build.edex/build.xml
index f1446cdf2a..965522bde6 100644
--- a/edexOsgi/build.edex/build.xml
+++ b/edexOsgi/build.edex/build.xml
@@ -107,10 +107,10 @@
                 value="com.raytheon.uf.edex.remote.script.feature" />
         </antcall>
 
-		<antcall target="build">
-			<param name="feature"
-				value="com.raytheon.uf.edex.binlightning.feature" />
-		</antcall>
+	<antcall target="build">
+		<param name="feature"
+			value="com.raytheon.uf.edex.binlightning.feature" />
+	</antcall>
 	</target>
 
     <!--
diff --git a/rpms/awips2.core/Installer.httpd-pypies/component.spec b/rpms/awips2.core/Installer.httpd-pypies/component.spec
index b4e9057cd7..304a57d877 100644
--- a/rpms/awips2.core/Installer.httpd-pypies/component.spec
+++ b/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
diff --git a/rpms/python.site-packages/Installer.h5py/component.spec b/rpms/python.site-packages/Installer.h5py/component.spec
index ea890beebe..932874780a 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: 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