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

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

Browse source 
Former-commit-id: 169b7d1b4c
This commit is contained in:
mjames-upc 2016-01-03 12:55:32 -07:00
commit 1e56d2f6d9
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpms/awips2.core/Installer.httpd-pypies/component.spec
View file

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

3
rpms/python.site-packages/Installer.h5py/component.spec
View file

@ -9,7 +9,7 @@
Name: awips2-python-h5py Name: awips2-python-h5py
Summary: AWIPS II Python h5py Distribution Summary: AWIPS II Python h5py Distribution
Version: 1.3.0 Version: 1.3.0
Release: 4 Release: 5
Group: AWIPSII Group: AWIPSII
BuildRoot: %{_build_root} BuildRoot: %{_build_root}
BuildArch: %{_build_arch} BuildArch: %{_build_arch}
@ -173,6 +173,7 @@ popd > /dev/null
rm -rf ${HDF5_PATH} rm -rf ${HDF5_PATH}
%pre %pre
rm -rf /awips2/python/lib/python2.7/site-packages/h5py*
%post %post