16.2.2-7.el7 build ready; cave and metpy spec updates

This commit is contained in:
Michael James 2016-12-02 19:15:11 +00:00
parent 94d427e1d9
commit 38adc9cfa8
6 changed files with 23 additions and 20 deletions

View file

@ -225,7 +225,7 @@ if [ -d /awips2/cave ]; then
updateCaveVersion
fi
chown -R awips:fxalpha /awips2/cave
chown -R awips:awips /awips2/cave
%preun
%postun
@ -242,6 +242,9 @@ rm -rf ${RPM_BUILD_ROOT}
%dir /awips2/cave/about_files
/awips2/cave/about_files/*
%doc /awips2/cave/about.html
/awips2/cave/epl-v10.html
/awips2/cave/notice.html
/awips2/cave/readme/readme_eclipse.html
/awips2/cave/artifacts.xml
/awips2/cave/cave.ini
%dir /awips2/cave/configuration

View file

@ -85,6 +85,7 @@ rm -rf %{_build_root}
rm -rf %{_python_build_loc}
%files
%defattr(644,awips,fxalpha,755)
%dir /awips2/python/lib/python2.7/site-packages
/awips2/python/lib/python2.7/site-packages/*
%defattr(644,awips,awips,755)
%dir /awips2/python/lib/python2.7/site-packages/metpy
/awips2/python/lib/python2.7/site-packages/metpy/*
/awips2/python/lib/python2.7/site-packages/MetPy*

View file

@ -1,6 +1,6 @@
#!/bin/bash -v
set -xe
rm -rf /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline/
#rm -rf /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline/
export JENKINS_WORKSPACE=/home/${USER}/awips2-builds
@ -81,10 +81,10 @@ popd > /dev/null 2>&1
export rpm_end_dir="${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/x86_64/)" ]; then
mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* /awips2/jenkins/build/awips2_${AWIPSII_VERSION}/x86_64/
mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* /awips2/jenkins/build/awips2-el7/x86_64/
fi
if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/noarch/)" ]; then
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* /awips2/jenkins/build/awips2_${AWIPSII_VERSION}/noarch/
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* /awips2/jenkins/build/awips2-el7/noarch/
fi
END_TIME=`date "+%s"`

View file

@ -16,7 +16,7 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace
# baseline is...
export BASELINE="${JENKINS_WORKSPACE}"
export AWIPSII_VERSION="16.2.2"
export AWIPSII_RELEASE="1"
export AWIPSII_RELEASE="7"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"

11
rpms/unidata/repo.sh Executable file
View file

@ -0,0 +1,11 @@
#!/bin/bash
export LD_LIBRARY_PATH=/usr/lib:/lib:/usr/lib64:/lib64
#if [ -z "$1" ]
# then
# exit 1
#fi
#unset LD_LIBRARY_PATH
pushd /awips2/jenkins/build/awips2-el7
repomanage -k1 --old . | xargs rm -f
createrepo -g ./comps.xml .
rsync -ruql --delete . /awips2/repo/awips2_16.2.2

View file

@ -16,24 +16,12 @@ javaUtilities/* rpms pythonPackages nativeLib/*
../awips2-ncep/viz/*
../awips2-ncep/features/*
../awips2-ncep/edex/*
../awips2-gsd/features/*
../awips2-gsd/viz/*
../awips2-cimss/viz/*
../awips2-cimss/features/*
../awips2-cimss/common/*
../awips2-cimss/edex/*
../awips2-ogc/edex/*
../awips2-ogc/features/*
../awips2-ogc/foss/*
../awips2-goesr/cave/*
../awips2-goesr/edexOsgi/*
../awips2-nasa/edex/*
../awips2-nasa/features/*
../awips2-data-delivery/common/*
../awips2-data-delivery/edex/*
../awips2-data-delivery/features/*
../awips2-data-delivery/viz/*
../awips2-data-delivery/rpms-Data_Delivery
../awips2-drawing/viz/*
../awips2-drawing/features/*
../awips2-nws/common/*