building 16.1.4-2 on moe

This commit is contained in:
mjames-upc 2016-04-06 21:17:43 -06:00
parent 3aa6f5df5c
commit 1714a57521
6 changed files with 13 additions and 29 deletions

View file

@ -181,11 +181,6 @@
</zip>
<!-- Temp zip file including all the license files -->
<zip destfile="/tmp/alertviz/FOSS_licenses.zip">
<fileset dir="${buildDirectory}/../../../rpms/legal/FOSS_licenses"/>
</zip>
<!-- Update the 64-bit (amd64) win32 CAVE zip with static files -->
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86_64.zip"
update="true">
@ -194,7 +189,6 @@
excludes="cave/**" />
<zipfileset dir="${buildDirectory}/../../../rpms/legal"
includes="Master_Rights_File.pdf" prefix="alertviz"/>
<zipfileset dir="/tmp/alertviz" includes="FOSS_licenses.zip" prefix="alertviz"/>
</zip>
</target>

View file

@ -191,11 +191,6 @@
</zip>
<!-- Temp zip file including all the license files -->
<zip destfile="/tmp/cave/FOSS_licenses.zip">
<fileset dir="${buildDirectory}/../../../rpms/legal/FOSS_licenses"/>
</zip>
<!-- Update the 64-bit (amd64) win32 CAVE zip with static and license files -->
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86_64.zip"
update="true">
@ -204,7 +199,6 @@
excludes="alertviz/**" />
<zipfileset dir="${buildDirectory}/../../../rpms/legal"
includes="Master_Rights_File.pdf" prefix="cave"/>
<zipfileset dir="/tmp/cave" includes="FOSS_licenses.zip" prefix="cave"/>
</zip>
</target>

View file

@ -319,17 +319,12 @@ rm -rf ${RPM_BUILD_ROOT}
/awips2/cave/*.ini
%dir /awips2/cave/configuration
/awips2/cave/configuration/*
%doc /awips2/cave/epl-v10.html
%dir /awips2/cave/features
/awips2/cave/features/*
%doc /awips2/cave/notice.html
%dir /awips2/cave/p2
/awips2/cave/p2/*
%dir /awips2/cave/plugins
/awips2/cave/plugins/*
%docdir /awips2/cave/readme
%dir /awips2/cave/readme
/awips2/cave/readme/*
/awips2/cave/.eclipseproduct
%defattr(755,awips,fxalpha,755)

View file

@ -21,7 +21,6 @@ Requires: ksh, libstdc++(x86-32), libgfortran(x86-32)
obsoletes: awips2-hydroapps-shared < 15.1.4
obsoletes: awips2-edex-hydro < 15.1.4
obsoletes: awips2-edex-dat < 15.1.4
provides: awips2-edex-upc
%description

View file

@ -121,8 +121,8 @@ if [ "${1}" = "-topo" ]; then
fi
if [ "${1}" = "-pydev" ]; then
#buildRPM "awips2-python"
buildRPM "awips2-python-awips"
#buildRPM "awips2-python-jep"
#buildRPM "awips2-python-awips"
buildRPM "awips2-python-jep"
#buildRPM "awips2-python-numpy"
#buildRPM "awips2-python-pyparsing"
#buildRPM "awips2-python-six"
@ -301,17 +301,19 @@ if [ "${1}" = "-httpd" ]; then
exit 0
fi
if [ "${1}" = "-postgres" ]; then
#buildRPM "awips2-pypies"
#buildRPM "awips2-postgres"
#buildRPM "awips2-edex-upc"
#buildRPM "awips2-database"
#buildRPM "awips2-database-standalone-configuration"
buildRPM "awips2-maps-database"
#buildRPM "awips2-ncep-database"
buildRPM "awips2-postgres"
exit 0
fi
if [ "${1}" = "-database" ]; then
buildRPM "awips2-pypies"
buildRPM "awips2-database"
buildRPM "awips2-database-standalone-configuration"
buildRPM "awips2-maps-database"
buildRPM "awips2-ncep-database"
exit 0
fi
if [ "${1}" = "-delta" ]; then
buildRPM "awips2"
buildRPM "awips2-common-base"

View file

@ -46,7 +46,7 @@ fi
%build
%install
PYTHON_AWIPS=/home/awips/python-awips
PYTHON_AWIPS=/home/mjames/python-awips
# awips (ufpy)
mkdir -p %{_build_root}/awips2/python/lib/python2.7/site-packages/awips