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

updates after moving to qpid 0.32

Browse source 
Former-commit-id: 246da78c767ef8aaf008cfc40c19dfd9398388fe [formerly 5de1a2aa7f]
Former-commit-id: 70fa8f8fae
This commit is contained in:
mjames-upc 2015-08-24 13:42:10 -06:00
parent 03b89a7ba0
commit 2c4a583c55
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpms/awips2.core/Installer.edex-environment/edex/component.spec
View file

@ -114,7 +114,7 @@ fi
_QPID_VERSION="0.30"
RPM_PROJECT="%{_baseline_workspace}/rpms"
POSTGRES_INITD="${RPM_PROJECT}/awips2.core/Installer.postgres/scripts/init.d/edex_postgres"
QPID_INITD="%{_baseline_workspace}/foss/qpid-java-broker-${_QPID_VERSION}/src/patch/qpid-java-broker-${_QPID_VERSION}/wrapper/qpidd"
QPID_INITD="%{_baseline_workspace}/foss/qpid-java-broker/src/patch/qpid-java-broker/wrapper/qpidd"
EDEX_INITD="${RPM_PROJECT}/awips2.edex/Installer.edex/scripts/init.d/edex_camel"
HTTPD_PYPIES_INITD="${RPM_PROJECT}/awips2.core/Installer.httpd-pypies/configuration/etc/init.d/httpd-pypies"

10
rpms/build/common/rpms.sh
View file

@ -65,7 +65,7 @@ function buildQPID()
fi
fi
cd ${WORKSPACE}/installers/RPMs/qpid-lib-0.30
cd ${WORKSPACE}/installers/RPMs/qpid-lib
if [ $? -ne 0 ]; then
echo "ERROR: Failed to build the qpid rpms."
return 1
@ -77,16 +77,16 @@ function buildQPID()
return 1
fi
#build 0.30
#build
export AWIPS_II_TOP_DIR
cd ${WORKSPACE}/installers/RPMs/qpid-java-broker-0.30
cd ${WORKSPACE}/installers/RPMs/qpid-java-broker
if [ $? -ne 0 ]; then
echo "ERROR: Failed to build Qpid Broker v0.30."
echo "ERROR: Failed to build Qpid Broker"
return 1
fi
/bin/bash build.sh
if [ $? -ne 0 ]; then
echo "ERROR: Failed to build Qpid Broker v0.30."
echo "ERROR: Failed to build Qpid Broker"
return 1
fi

6
rpms/python.site-packages/Installer.qpid/component.spec
View file

@ -8,7 +8,7 @@
#
Name: awips2-python-qpid
Summary: AWIPS II Python qpid Distribution
Version: 0.30
Version: 0.32
Release: %{_component_version}.%{_component_release}
BuildArch: noarch
Group: AWIPSII
@ -45,7 +45,7 @@ mkdir -p %{_python_build_loc}
%build
QPID_SRC_DIR="%{_python_pkgs_dir}/qpid"
QPID_TAR="qpid-python-0.30.tar.gz"
QPID_TAR="qpid-python-0.32.tar.gz"
cp -rv ${QPID_SRC_DIR}/${QPID_TAR} \
%{_python_build_loc}
@ -61,7 +61,7 @@ popd > /dev/null
%install
QPID_SRC_DIR="%{_python_pkgs_dir}/qpid"
QPID_SRC="qpid-python-0.30"
QPID_SRC="qpid-python-0.32"
QPID_STAT_SCRIPT="qpid-stat"
QPID_QUEUE_COUNT_SCRIPT="qpid-queue-count"
QPID_MONITOR_SCRIPT="monitor_qpid_host.sh"