diff --git a/rpms/build/common/lookupRPM.sh b/rpms/build/common/lookupRPM.sh index 440237a80d..9445f567c3 100644 --- a/rpms/build/common/lookupRPM.sh +++ b/rpms/build/common/lookupRPM.sh @@ -145,7 +145,7 @@ function lookupRPM() return 0 fi if [ "${1}" = "awips2-python-shapely" ]; then - export RPM_SPECIFICATION="${installer_dir}/shapely-1.5.9/" + export RPM_SPECIFICATION="${installer_dir}/shapely-1.4.4/" return 0 fi diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh index 3029a0cf09..360240d674 100644 --- a/rpms/build/x86_64/build.sh +++ b/rpms/build/x86_64/build.sh @@ -123,7 +123,7 @@ if [ "${1}" = "-python" ]; then #buildRPM "awips2-python-dynamicserialize" #buildRPM "awips2-python-h5py" #buildRPM "awips2-python-jimporter" - buildRPM "awips2-python-matplotlib" + #buildRPM "awips2-python-matplotlib" #buildRPM "awips2-python-nose" #buildRPM "awips2-python-cython" #buildRPM "awips2-python-six" @@ -145,7 +145,7 @@ if [ "${1}" = "-python" ]; then #buildRPM "awips2-python-werkzeug" #buildRPM "awips2-python-pygtk" #buildRPM "awips2-python-pycairo" - #buildRPM "awips2-python-shapely" + buildRPM "awips2-python-shapely" #buildRPM "awips2-notification" exit 0 diff --git a/rpms/python.site-packages/Installer.scipy/component.spec b/rpms/python.site-packages/Installer.scipy/component.spec index d0556a6f09..a937d85c0c 100644 --- a/rpms/python.site-packages/Installer.scipy/component.spec +++ b/rpms/python.site-packages/Installer.scipy/component.spec @@ -9,7 +9,7 @@ Name: awips2-python-scipy Summary: AWIPS II Python scipy Distribution Version: 0.8.0 -Release: 1 +Release: 5 Group: AWIPSII BuildRoot: %{_build_root} BuildArch: %{_build_arch} diff --git a/rpms/unidata/buildEnvironment.sh b/rpms/unidata/buildEnvironment.sh index da901ceb26..f5f2997481 100755 --- a/rpms/unidata/buildEnvironment.sh +++ b/rpms/unidata/buildEnvironment.sh @@ -13,8 +13,8 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace # baseline is... export BASELINE="${JENKINS_WORKSPACE}" export AWIPSII_VERSION="14.4.1" -export BUILD_NUMBER="1" -export AWIPSII_RELEASE="3n${BUILD_NUMBER}" +export BUILD_NUMBER="3" +export AWIPSII_RELEASE="4n${BUILD_NUMBER}" export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"