From f1c6ef00e97e1a7bb6f419770f4b2819a93f3c76 Mon Sep 17 00:00:00 2001 From: David Lovely Date: Thu, 19 Nov 2015 13:21:11 -0600 Subject: [PATCH] Omaha #4738 WA12.6 Updated SPEC files. Former-commit-id: d5dac85650053efa4af8611d56ddc8cae1aa030a --- .../Installer.alertviz/component.spec | 10 +- rpms/awips2.cave/deploy.builder/build.sh | 4 +- .../Installer.common-base/component.spec | 12 +- .../edex/component.spec | 28 +- .../Installer.gfesuite-client/component.spec | 16 +- .../Installer.gfesuite-server/component.spec | 16 +- rpms/awips2.core/Installer.ldm/component.spec | 8 +- .../component.spec | 2 +- .../Installer.notification/component.spec | 10 +- .../Installer.pgadmin/component.spec | 18 +- rpms/awips2.core/Installer.rcm/component.spec | 8 +- .../Installer.tools/component.spec | 16 +- rpms/build/common/lookupRPM.sh | 55 +-- rpms/build/common/rpms.sh | 68 +--- rpms/build/x86_64/build.sh | 313 +----------------- .../Installer.cherrypy/component.spec | 10 +- .../Installer.dynamicserialize/component.spec | 13 +- .../Installer.nose/component.spec | 10 +- .../Installer.pil/component.spec | 12 +- .../Installer.pmw/component.spec | 10 +- .../Installer.pupynere/component.spec | 15 +- .../Installer.pycairo/component.spec | 10 +- .../Installer.pygtk/component.spec | 13 +- .../Installer.thrift/component.spec | 10 +- .../Installer.tpg/component.spec | 10 +- .../Installer.ufpy/component.spec | 10 +- .../Installer.werkzeug/component.spec | 12 +- 27 files changed, 202 insertions(+), 517 deletions(-) diff --git a/rpms/awips2.cave/Installer.alertviz/component.spec b/rpms/awips2.cave/Installer.alertviz/component.spec index af89328c5c..fa9196611a 100644 --- a/rpms/awips2.cave/Installer.alertviz/component.spec +++ b/rpms/awips2.cave/Installer.alertviz/component.spec @@ -19,12 +19,14 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -provides: awips2-alertviz -requires: awips2-python -requires: awips2-java +Provides: awips2-alertviz +Requires: awips2-python +Requires: awips2-java + +BuildRequires: awips2-ant +BuildRequires: awips2-java %description AWIPS II AlertViz Distribution - the AWIPS II AlertViz application. diff --git a/rpms/awips2.cave/deploy.builder/build.sh b/rpms/awips2.cave/deploy.builder/build.sh index b568d5b268..d760e3ebe2 100644 --- a/rpms/awips2.cave/deploy.builder/build.sh +++ b/rpms/awips2.cave/deploy.builder/build.sh @@ -90,7 +90,7 @@ function buildCAVERPM() fi # Build The RPM. - rpmbuild -ba --target=${TARGET_BUILD_ARCH} \ + rpmbuild -bb --target=${TARGET_BUILD_ARCH} \ --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \ --define '_component_version %(echo ${AWIPSII_VERSION})' \ --define '_component_release %(echo ${AWIPSII_RELEASE})' \ @@ -343,4 +343,4 @@ popd > /dev/null cp ${pde_build_dir}/I.CAVE/CAVE-linux.gtk.x86_64.zip ${WORKSPACE}/rpms/awips2.cave/setup/dist/ cd ${WORKSPACE}/rpms/awips2.cave -buildCAVERPM "Installer.cave" "awips2-cave-ncep" \ No newline at end of file +buildCAVERPM "Installer.cave" "awips2-cave-ncep" diff --git a/rpms/awips2.core/Installer.common-base/component.spec b/rpms/awips2.core/Installer.common-base/component.spec index d0f6af99a2..743f55d2de 100644 --- a/rpms/awips2.core/Installer.common-base/component.spec +++ b/rpms/awips2.core/Installer.common-base/component.spec @@ -18,13 +18,15 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -provides: awips2-common-base -requires: awips2-base -requires: netcdf = 4.1.2 -requires: netcdf-devel = 4.1.2 +Provides: awips2-common-base +Requires: awips2-base +Requires: netcdf = 4.1.2 +Requires: netcdf-devel = 4.1.2 + +BuildRequires: awips2-ant +BuildRequires: awips2-java %description AWIPS II Common Base - Contains common plugins utilized by both EDEX and CAVE. diff --git a/rpms/awips2.core/Installer.edex-environment/edex/component.spec b/rpms/awips2.core/Installer.edex-environment/edex/component.spec index 2a449d8a72..de4d7c48ae 100644 --- a/rpms/awips2.core/Installer.edex-environment/edex/component.spec +++ b/rpms/awips2.core/Installer.edex-environment/edex/component.spec @@ -13,18 +13,20 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -provides: awips2-edex-environment -requires: awips2-edex-base -requires: awips2-postgresql -requires: awips2-qpid-java-broker -requires: awips2-qpid-java-client -requires: awips2-qpid-java-common -requires: awips2-python -requires: awips2-java -requires: awips2-psql +Provides: awips2-edex-environment +Requires: awips2-edex-base +Requires: awips2-postgresql +Requires: awips2-qpid-java-broker +Requires: awips2-qpid-java-client +Requires: awips2-qpid-java-common +Requires: awips2-python +Requires: awips2-java +Requires: awips2-psql + +BuildRequires: awips2-ant +BuildRequires: awips2-java %description The edex environment version of awips2-edex consists of @@ -111,11 +113,9 @@ if [ $? -ne 0 ]; then exit 1 fi -_QPID_VERSION="0.32" -_POSTGRESQL_VERSION="9.3.10" RPM_PROJECT="%{_baseline_workspace}/rpms" -POSTGRES_INITD="%{_baseline_workspace}/foss/postgresql-${_POSTGRESQL_VERSION}/scripts/init.d/edex_postgres" -QPID_INITD="%{_baseline_workspace}/foss/qpid-java-broker-${_QPID_VERSION}/src/patch/qpid-java-broker-${_QPID_VERSION}/wrapper/qpidd" +POSTGRES_INITD="%{_baseline_workspace}/installers/RPMs/postgresql/scripts/init.d/edex_postgres" +QPID_INITD="%{_baseline_workspace}/installers/RPMs/qpid-java-broker/scripts/init.d/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" diff --git a/rpms/awips2.core/Installer.gfesuite-client/component.spec b/rpms/awips2.core/Installer.gfesuite-client/component.spec index bb85adc960..16368aa739 100644 --- a/rpms/awips2.core/Installer.gfesuite-client/component.spec +++ b/rpms/awips2.core/Installer.gfesuite-client/component.spec @@ -12,12 +12,15 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -provides: awips2-gfesuite-client -requires: awips2-python -requires: awips2-cave +Provides: awips2-gfesuite-client +Requires: awips2-python +Requires: awips2-cave +Requires: awips2-java + +BuildRequires: awips2-ant +BuildRequires: awips2-java %description AWIPS II gfesuite-client Installation - Contains The AWIPS II gfesuite-client Component. @@ -35,11 +38,6 @@ then fi %build -# Verify that awips2-ant is installed. -if [ ! -f /awips2/ant/bin/ant ]; then - echo "ERROR: Unable to find the awips2-ant executable." - exit 1 -fi %install mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite diff --git a/rpms/awips2.core/Installer.gfesuite-server/component.spec b/rpms/awips2.core/Installer.gfesuite-server/component.spec index 4deb220e95..54ddb92093 100644 --- a/rpms/awips2.core/Installer.gfesuite-server/component.spec +++ b/rpms/awips2.core/Installer.gfesuite-server/component.spec @@ -12,12 +12,15 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -provides: awips2-gfesuite-server -requires: awips2-python -requires: awips2-edex-gfe +Provides: awips2-gfesuite-server +Requires: awips2-python +Requires: awips2-edex-gfe +Requires: awips2-java + +BuildRequires: awips2-ant +BuildRequires: awips2-java %description AWIPS II gfesuite-client Installation - Contains The AWIPS II gfesuite-server Component. @@ -35,11 +38,6 @@ then fi %build -# Verify that awips2-ant is installed. -if [ ! -f /awips2/ant/bin/ant ]; then - echo "ERROR: Unable to find the awips2-ant executable." - exit 1 -fi %install mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite diff --git a/rpms/awips2.core/Installer.ldm/component.spec b/rpms/awips2.core/Installer.ldm/component.spec index e4c9f1d839..a311806a04 100644 --- a/rpms/awips2.core/Installer.ldm/component.spec +++ b/rpms/awips2.core/Installer.ldm/component.spec @@ -17,14 +17,12 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no Requires: awips2-qpid-lib -requires: awips2-python -requires: awips2-python -provides: awips2-ldm -provides: awips2-base-component +Requires: awips2-python +Provides: awips2-ldm +Provides: awips2-base-component %description AWIPS II LDM Distribution - Contains AWIPS II LDM. diff --git a/rpms/awips2.core/Installer.localapps-environment/component.spec b/rpms/awips2.core/Installer.localapps-environment/component.spec index 647a113059..ce0c3ece46 100644 --- a/rpms/awips2.core/Installer.localapps-environment/component.spec +++ b/rpms/awips2.core/Installer.localapps-environment/component.spec @@ -12,9 +12,9 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no +Provides: awips2-localapps-environment %description AWIPS II localapps Environment Spec File - This rpm will install diff --git a/rpms/awips2.core/Installer.notification/component.spec b/rpms/awips2.core/Installer.notification/component.spec index f8e4a456af..a4d9d0a844 100644 --- a/rpms/awips2.core/Installer.notification/component.spec +++ b/rpms/awips2.core/Installer.notification/component.spec @@ -25,12 +25,14 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: boost >= 1.33.1 -requires: awips2-qpid-lib -provides: awips2-notification +Requires: boost >= 1.33.1 +Requires: awips2-qpid-lib +Provides: awips2-notification + +BuildRequires: awips2-java +BuildRequires: awips2-qpid-lib %description AWIPS II Notification Distribution - the AWIPS II Notification application. diff --git a/rpms/awips2.core/Installer.pgadmin/component.spec b/rpms/awips2.core/Installer.pgadmin/component.spec index b6d0355144..f6d64dbfaf 100644 --- a/rpms/awips2.core/Installer.pgadmin/component.spec +++ b/rpms/awips2.core/Installer.pgadmin/component.spec @@ -17,23 +17,21 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -BuildRequires: awips2-postgresql = 9.2.3-1.el6 -BuildRequires: postgresql >= 8.4.13-1.el6_3 -BuildRequires: postgresql-devel >= 8.4.13-1.el6_3 -BuildRequires: postgresql-libs >= 8.4.13-1.el6_3 +BuildRequires: awips2-postgresql = 9.3.9 BuildRequires: wxGTK >= 2.8.12-1 BuildRequires: wxGTK-devel >= 2.8.12-1 +BuildRequires: libxml2 +BuildRequires: libxslt -provides: awips2-pgadmin3 -requires: awips2-psql = 9.2.3-1 -requires: wxGTK >= 2.8.12-1 +Provides: awips2-pgadmin3 +Requires: awips2-psql >= 9.2.3 +Requires: wxGTK >= 2.8.12-1 %description AWIPS II pgadmin3 Distribution - A custom compilation of the pgadmin3 client compatible with -CentOS / Redhat 5.5. +CentOS / Redhat 6.4. %prep # Ensure that a "buildroot" has been specified. @@ -75,7 +73,7 @@ cd %{_pgadmin3_build_loc}/pgadmin3-%{_pgadmin3_version} export CPPFLAGS="-I/awips2/postgresql/include -I/awips2/postgresql/include/server" export LDFLAGS="-L/awips2/postgresql/lib" -./configure --prefix=/awips2/pgadmin3 +./configure --prefix=/awips2/pgadmin3 --with-pgsql=/awips2/postgresql if [ $? -ne 0 ]; then exit 1 fi diff --git a/rpms/awips2.core/Installer.rcm/component.spec b/rpms/awips2.core/Installer.rcm/component.spec index 6975ea278e..cfa974e778 100644 --- a/rpms/awips2.core/Installer.rcm/component.spec +++ b/rpms/awips2.core/Installer.rcm/component.spec @@ -15,11 +15,13 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -provides: awips2-rcm -requires: awips2-java +Provides: awips2-rcm +Requires: awips2-java + +BuildRequires: awips2-ant +BuildRequires: awips2-java %description AWIPS II Radar Server Installation - Sets Up AWIPS II Radar Server. diff --git a/rpms/awips2.core/Installer.tools/component.spec b/rpms/awips2.core/Installer.tools/component.spec index 664c7e9c06..89b1bd2699 100644 --- a/rpms/awips2.core/Installer.tools/component.spec +++ b/rpms/awips2.core/Installer.tools/component.spec @@ -10,18 +10,18 @@ Summary: AWIPS II Tools Distribution Version: 1.8.5 Release: %{_component_version}.%{_component_release}%{?dist} Group: AWIPSII -BuildRequires: awips2-python-h5py -BuildRoot: /tmp BuildRoot: %{_build_root} BuildArch: %{_build_arch} URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -provides: awips2-tools +Provides: awips2-tools + +BuildRequires: awips2-python +BuildRequires: awips2-python-h5py %description AWIPS II Python Distribution - Contains the AWIPS II Tool-Set. Presently, @@ -45,14 +45,6 @@ fi mkdir -p %{_tools_build_loc} %build -# Ensure that awips2-python has been installed -COMMAND=`rpm -q awips2-python` -if [ $? -ne 0 ]; then - echo "ERROR: awips2-python Must Be Installed." - echo "Unable To Continue ... Terminating." - exit 1 -fi - # Update LD_LIBRARY_PATH export LD_LIBRARY_PATH=/awips2/python/lib:$LD_LIBRARY_PATH diff --git a/rpms/build/common/lookupRPM.sh b/rpms/build/common/lookupRPM.sh index 2185ec1008..9eab46e9c5 100644 --- a/rpms/build/common/lookupRPM.sh +++ b/rpms/build/common/lookupRPM.sh @@ -24,8 +24,6 @@ function lookupRPM() awips2_ade_dir="${rpms_dir}/awips2.ade" awips2_cave_dir="${rpms_dir}/awips2.cave" awips2_core_dir="${rpms_dir}/awips2.core" - awips2_edex_dir="${rpms_dir}/awips2.edex" - awips2_qpid_dir="${rpms_dir}/awips2.qpid" python_site__dir="${rpms_dir}/python.site-packages" installer_dir="${rpms_dir}/../installers/RPMs" @@ -34,11 +32,11 @@ function lookupRPM() # foss rpms -> python rpms. if [ "${1}" = "awips2-maven" ]; then - export RPM_SPECIFICATION="${installer_dir}/maven-3.2.3/" + export RPM_SPECIFICATION="${installer_dir}/maven/" return 0 fi if [ "${1}" = "awips2-python" ]; then - export RPM_SPECIFICATION="${installer_dir}/python-2.7.10/" + export RPM_SPECIFICATION="${installer_dir}/python/" return 0 fi if [ "${1}" = "awips2-python-cherrypy" ]; then @@ -50,31 +48,31 @@ function lookupRPM() return 0 fi if [ "${1}" = "awips2-python-h5py" ]; then - export RPM_SPECIFICATION="${installer_dir}/h5py-1.3.0/" + export RPM_SPECIFICATION="${installer_dir}/h5py/" return 0 fi if [ "${1}" = "awips2-python-setuptools" ]; then - export RPM_SPECIFICATION="${installer_dir}/setuptools-18.0.1/" + export RPM_SPECIFICATION="${installer_dir}/setuptools/" return 0 fi if [ "${1}" = "awips2-python-matplotlib" ]; then - export RPM_SPECIFICATION="${installer_dir}/matplotlib-1.4.3/" + export RPM_SPECIFICATION="${installer_dir}/matplotlib/" return 0 fi if [ "${1}" = "awips2-python-dateutil" ]; then - export RPM_SPECIFICATION="${installer_dir}/python-dateutil-2.4.2/" + export RPM_SPECIFICATION="${installer_dir}/python-dateutil/" return 0 fi if [ "${1}" = "awips2-python-pytz" ]; then - export RPM_SPECIFICATION="${installer_dir}/pytz-2015.4/" + export RPM_SPECIFICATION="${installer_dir}/pytz/" return 0 fi if [ "${1}" = "awips2-python-six" ]; then - export RPM_SPECIFICATION="${installer_dir}/six-1.9.0/" + export RPM_SPECIFICATION="${installer_dir}/six/" return 0 fi if [ "${1}" = "awips2-python-pyparsing" ]; then - export RPM_SPECIFICATION="${installer_dir}/pyparsing-2.0.3/" + export RPM_SPECIFICATION="${installer_dir}/pyparsing/" return 0 fi if [ "${1}" = "awips2-python-nose" ]; then @@ -82,11 +80,11 @@ function lookupRPM() return 0 fi if [ "${1}" = "awips2-python-numpy" ]; then - export RPM_SPECIFICATION="${installer_dir}/numpy-1.9.2/" + export RPM_SPECIFICATION="${installer_dir}/numpy/" return 0 fi if [ "${1}" = "awips2-python-jep" ]; then - export RPM_SPECIFICATION="${installer_dir}/jep-3.4.1/" + export RPM_SPECIFICATION="${installer_dir}/jep/" return 0 fi if [ "${1}" = "awips2-python-pil" ]; then @@ -102,19 +100,19 @@ function lookupRPM() return 0 fi if [ "${1}" = "awips2-python-qpid" ]; then - export RPM_SPECIFICATION="${installer_dir}/qpid-python-0.32" + export RPM_SPECIFICATION="${installer_dir}/qpid-python" return 0 fi if [ "${1}" = "awips2-python-scientific" ]; then - export RPM_SPECIFICATION="${installer_dir}/scientific-2.8" + export RPM_SPECIFICATION="${installer_dir}/scientific" return 0 fi if [ "${1}" = "awips2-python-scipy" ]; then - export RPM_SPECIFICATION="${installer_dir}/scipy-0.15.1/" + export RPM_SPECIFICATION="${installer_dir}/scipy/" return 0 fi if [ "${1}" = "awips2-python-tables" ]; then - export RPM_SPECIFICATION="${installer_dir}/tables-2.1.2/" + export RPM_SPECIFICATION="${installer_dir}/tables/" return 0 fi if [ "${1}" = "awips2-python-thrift" ]; then @@ -142,7 +140,7 @@ function lookupRPM() return 0 fi if [ "${1}" = "awips2-python-shapely" ]; then - export RPM_SPECIFICATION="${installer_dir}/shapely-1.4.4/" + export RPM_SPECIFICATION="${installer_dir}/shapely/" return 0 fi @@ -228,11 +226,20 @@ function lookupRPM() fi # foss rpms. - if [ "${1}" = "-qpid" ]; then + if [ "${1}" = "awips2-qpid-java" ]; then + export RPM_SPECIFICATION="${installer_dir}/qpid-java" + return 0 + fi + if [ "${1}" = "awips2-qpid-lib" ]; then + export RPM_SPECIFICATION="${installer_dir}/qpid-lib" + return 0 + fi + if [ "${1}" = "awips2-qpid-java-broker" ]; then + export RPM_SPECIFICATION="${installer_dir}/qpid-java-broker" return 0 fi if [ "${1}" = "awips2-ant" ]; then - export RPM_SPECIFICATION="${installer_dir}/ant-1.9.6" + export RPM_SPECIFICATION="${installer_dir}/ant" return 0 fi if [ "${1}" = "awips2-httpd-pypies" ]; then @@ -240,7 +247,7 @@ function lookupRPM() return 0 fi if [ "${1}" = "awips2-java" ]; then - export RPM_SPECIFICATION="${installer_dir}/java-1.7" + export RPM_SPECIFICATION="${installer_dir}/java" return 0 fi if [ "${1}" = "awips2-groovy" ]; then @@ -251,8 +258,8 @@ function lookupRPM() export RPM_SPECIFICATION="${awips2_core_dir}/Installer.ldm" return 0 fi - if [ "${1}" = "awips2-postgres" ]; then - export RPM_SPECIFICATION="${installer_dir}/postgresql-9.3.10" + if [ "${1}" = "awips2-postgresql" ]; then + export RPM_SPECIFICATION="${installer_dir}/postgresql" return 0 fi if [ "${1}" = "awips2-pgadmin3" ]; then @@ -268,7 +275,7 @@ function lookupRPM() return 0 fi if [ "${1}" = "awips2-yajsw" ]; then - export RPM_SPECIFICATION="${installer_dir}/yajsw-11.11" + export RPM_SPECIFICATION="${installer_dir}/yajsw" return 0 fi diff --git a/rpms/build/common/rpms.sh b/rpms/build/common/rpms.sh index 423f0399aa..36e21d63c4 100644 --- a/rpms/build/common/rpms.sh +++ b/rpms/build/common/rpms.sh @@ -1,71 +1,5 @@ #!/bin/bash -function buildJava() -{ - pushd . > /dev/null 2>&1 - - cd ${WORKSPACE}/installers/RPMs/java-1.7 - /bin/bash build.sh - if [ $? -ne 0 ]; then - return 1 - fi - - popd > /dev/null 2>&1 -} - -function buildQPID() -{ - # Arguments: - # ${1} == optionally -ade - - pushd . > /dev/null 2>&1 - - # ensure that the destination rpm directories exist - if [ ! -d ${AWIPSII_TOP_DIR}/RPMS/noarch ]; then - mkdir -p ${AWIPSII_TOP_DIR}/RPMS/noarch - if [ $? -ne 0 ]; then - exit 1 - fi - fi - - # ensure that the destination rpm directories exist - if [ ! -d ${AWIPSII_TOP_DIR}/RPMS/x86_64 ]; then - mkdir -p ${AWIPSII_TOP_DIR}/RPMS/x86_64 - if [ $? -ne 0 ]; then - exit 1 - fi - fi - - cd ${WORKSPACE}/installers/RPMs/qpid-lib-0.32 - if [ $? -ne 0 ]; then - echo "ERROR: Failed to build the qpid rpms." - return 1 - fi - - /bin/bash build.sh - if [ $? -ne 0 ]; then - echo "ERROR: Failed to build the qpid rpms." - return 1 - fi - - #build 0.32 - export AWIPS_II_TOP_DIR - cd ${WORKSPACE}/installers/RPMs/qpid-java-broker-0.32 - if [ $? -ne 0 ]; then - echo "ERROR: Failed to build Qpid Broker v0.32." - return 1 - fi - /bin/bash build.sh - if [ $? -ne 0 ]; then - echo "ERROR: Failed to build Qpid Broker v0.32." - return 1 - fi - - popd > /dev/null 2>&1 - - return 0 -} - function buildEDEX() { cd ${WORKSPACE}/rpms/awips2.edex/deploy.builder @@ -147,7 +81,7 @@ function buildLocalizationRPMs() echo "Building localization rpm for site: ${site}." - rpmbuild -ba \ + rpmbuild -bb \ --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \ --define '_component_version %(echo ${AWIPSII_VERSION})' \ --define '_component_release %(echo ${AWIPSII_RELEASE})' \ diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh index 367816af0f..788a0ca06c 100644 --- a/rpms/build/x86_64/build.sh +++ b/rpms/build/x86_64/build.sh @@ -20,7 +20,7 @@ function buildRPMExec() # Arguments: # 1) specs file location - /usr/bin/rpmbuild -ba \ + /usr/bin/rpmbuild -bb \ --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \ --define '_baseline_workspace %(echo ${WORKSPACE})' \ --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \ @@ -99,7 +99,7 @@ fi if [ "${1}" = "-buildRPM" -a -n "${2}" ]; then echo "Building RPM: ${2}" - # also allow buildJava, buildRPM args + # also allow buildCAVE, buildEDEX, buildRPM args buildName=`echo ${2} | cut -c1-5` if [ ${#2} -gt 5 -a "$buildName" = "build" ]; then ${2} @@ -113,57 +113,23 @@ if [ "${1}" = "-buildRPM" -a -n "${2}" ]; then fi if [ "${1}" = "-WA" ]; then - WA_rpm_build - exit 0 -fi - -if [ "${1}" = "-64bit" ]; then - buildCAVE - if [ $? -ne 0 ]; then - exit 1 - fi - buildRPM "awips2-alertviz" - if [ $? -ne 0 ]; then - exit 1 - fi - buildRPM "awips2-python" - buildRPM "awips2-python-cherrypy" - buildRPM "awips2-python-dynamicserialize" - buildRPM "awips2-python-h5py" - buildRPM "awips2-python-matplotlib" - buildRPM "awips2-python-nose" - buildRPM "awips2-python-numpy" - buildRPM "awips2-python-pil" - buildRPM "awips2-python-pmw" - buildRPM "awips2-python-pupynere" - buildRPM "awips2-python-qpid" - buildRPM "awips2-python-scientific" - buildRPM "awips2-python-scipy" - buildRPM "awips2-python-tables" - buildRPM "awips2-python-thrift" - buildRPM "awips2-python-tpg" - buildRPM "awips2-python-ufpy" - buildRPM "awips2-python-werkzeug" - buildRPM "awips2-python-pygtk" - buildRPM "awips2-python-pycairo" - buildRPM "awips2-python-jep" - buildJava - buildRPM "awips2" - buildRPM "awips2-python-shapely" - buildRPM "awips2-notification" - + WA_rpm_build exit 0 fi if [ "${1}" = "-rh6" ]; then - buildRPM "awips2-common-base" - buildRPM "awips2-notification" + buildCAVE + if [ $? -ne 0 ]; then + exit 1 + fi buildEDEX if [ $? -ne 0 ]; then exit 1 fi + buildRPM "awips2-common-base" + buildRPM "awips2-notification" buildRPM "awips2-hydroapps-shared" - buildJava + buildRPM "awips2-java" buildRPM "awips2-python" buildRPM "awips2-python-cherrypy" buildRPM "awips2-python-nose" @@ -194,22 +160,17 @@ if [ "${1}" = "-rh6" ]; then buildRPM "awips2-ant" buildRPM "awips2-maven" buildRPM "awips2-tools" - buildRPM "awips2-postgres" + buildRPM "awips2-postgresql" buildRPM "awips2-pgadmin3" unpackHttpdPypies if [ $? -ne 0 ]; then exit 1 fi buildRPM "awips2-httpd-pypies" - buildQPID - if [ $? -ne 0 ]; then - exit 1 - fi + buildRPM "awips2-qpid-lib" + buildRPM "awips2-qpid-java" + buildRPM "awips2-qpid-java-broker" buildRPM "awips2-ldm" - buildCAVE - if [ $? -ne 0 ]; then - exit 1 - fi buildRPM "awips2-alertviz" buildRPM "awips2-database-server-configuration" buildRPM "awips2-database-standalone-configuration" @@ -237,129 +198,6 @@ if [ "${1}" = "-rh6" ]; then exit 0 fi -if [ "${1}" = "-postgres" ]; then - buildRPM "awips2-postgres" - buildRPM "awips2-database-server-configuration" - buildRPM "awips2-database-standalone-configuration" - buildRPM "awips2-database" - buildRPM "awips2-maps-database" - buildRPM "awips2-ncep-database" - buildRPM "awips2-pgadmin3" - - exit 0 -fi - -if [ "${1}" = "-delta" ]; then - buildRPM "awips2" - buildRPM "awips2-common-base" - buildCAVE - if [ $? -ne 0 ]; then - exit 1 - fi - buildRPM "awips2-alertviz" - buildEDEX - if [ $? -ne 0 ]; then - exit 1 - fi - - buildRPM "awips2-ncep-database" - buildRPM "awips2-gfesuite-client" - buildRPM "awips2-gfesuite-server" - buildRPM "awips2-python-dynamicserialize" - buildRPM "awips2-python-ufpy" - - buildRPM "awips2-aviation-shared" - buildRPM "awips2-cli" - buildRPM "awips2-database" - buildRPM "awips2-database-server-configuration" - buildRPM "awips2-database-standalone-configuration" - buildRPM "awips2-gfesuite-client" - buildRPM "awips2-gfesuite-server" - buildRPM "awips2-localapps-environment" - buildRPM "awips2-maps-database" - buildRPM "awips2-notification" - buildRPM "awips2-pypies" - buildRPM "awips2-data.hdf5-topo" - buildRPM "awips2-data.gfe" - buildRPM "awips2-rcm" - buildLocalizationRPMs - if [ $? -ne 0 ]; then - exit 1 - fi - - exit 0 -fi - -if [ "${1}" = "-full" ]; then - buildRPM "awips2-common-base" - buildCAVE - if [ $? -ne 0 ]; then - exit 1 - fi - buildRPM "awips2-alertviz" - buildEDEX - if [ $? -ne 0 ]; then - exit 1 - fi - buildRPM "awips2-python" - buildRPM "awips2-python-cherrypy" - buildRPM "awips2-python-dynamicserialize" - buildRPM "awips2-python-h5py" - buildRPM "awips2-python-matplotlib" - buildRPM "awips2-python-nose" - buildRPM "awips2-python-numpy" - buildRPM "awips2-python-pil" - buildRPM "awips2-python-pmw" - buildRPM "awips2-python-pupynere" - buildRPM "awips2-python-qpid" - buildRPM "awips2-python-scientific" - buildRPM "awips2-python-scipy" - buildRPM "awips2-python-tables" - buildRPM "awips2-python-thrift" - buildRPM "awips2-python-tpg" - buildRPM "awips2-python-ufpy" - buildRPM "awips2-python-werkzeug" - buildRPM "awips2-python-pygtk" - buildRPM "awips2-python-pycairo" - buildRPM "awips2-python-jep" - buildRPM "awips2-cli" - buildRPM "awips2-gfesuite-client" - buildRPM "awips2-gfesuite-server" - buildRPM "awips2-localapps-environment" - buildRPM "awips2-data.hdf5-topo" - buildRPM "awips2-data.gfe" - buildRPM "awips2" - unpackHttpdPypies - if [ $? -ne 0 ]; then - exit 1 - fi - buildRPM "awips2-httpd-pypies" - buildJava - buildRPM "awips2-groovy" - buildLocalizationRPMs - if [ $? -ne 0 ]; then - exit 1 - fi - buildRPM "awips2-edex-environment" - buildRPM "awips2-notification" - buildRPM "awips2-python-shapely" - buildRPM "awips2-postgres" - buildRPM "awips2-database" - buildRPM "awips2-maps-database" - buildRPM "awips2-ncep-database" - buildRPM "awips2-pgadmin3" - buildRPM "awips2-ldm" - exit 0 -fi - -#if [ "${1}" = "-ade" ]; then -# echo "INFO: AWIPS II currently does not support a 64-bit version of the ADE." -# exit 0 -# buildRPM "awips2-eclipse" -# -# exit 0 -#fi - if [ "${1}" = "-ade" ]; then buildRPM "awips2-eclipse" buildJava @@ -386,10 +224,9 @@ if [ "${1}" = "-ade" ]; then buildRPM "awips2-python-pycairo" buildRPM "awips2-python-shapely" buildRPM "awips2-python-jep" - buildQPID -ade - if [ $? -ne 0 ]; then - exit 1 - fi + buildRPM "awips2-qpid-lib" + buildRPM "awips2-qpid-java" + buildRPM "awips2-qpid-java-broker" # Package the ade. # Create the containing directory. @@ -440,121 +277,6 @@ if [ "${1}" = "-ade" ]; then exit 0 fi - -if [ "${1}" = "-viz" ]; then - buildRPM "awips2" - #buildRPM "awips2-python-numpy" - #buildRPM "awips2-ant" - #buildRPM "awips2-python-dynamicserialize" - #buildRPM "awips2-python" - #buildRPM "awips2-adapt-native" - #unpackHttpdPypies - #if [ $? -ne 0 ]; then - # exit 1 - #fi - #buildRPM "awips2-httpd-pypies" - #buildRPM "awips2-hydroapps-shared" - #buildRPM "awips2-rcm" - #buildRPM "awips2-gfesuite-client" - #buildRPM "awips2-gfesuite-server" - #buildRPM "awips2-tools" - #buildRPM "awips2-cli" - buildCAVE - if [ $? -ne 0 ]; then - exit 1 - fi - buildRPM "awips2-alertviz" - - exit 0 -fi - -if [ "${1}" = "-edex" ]; then - ##buildRPM "awips2-common-base" - #buildRPM "awips2" - buildEDEX - if [ $? -ne 0 ]; then - exit 1 - fi - #buildRPM "awips2-python-dynamicserialize" - - exit 0 -fi - -if [ "${1}" = "-custom" ]; then - #buildQPID - #if [ $? -ne 0 ]; then - # exit 1 - #fi - #buildRPM "awips2-adapt-native" - #buildRPM "awips2-hydroapps-shared" - #buildRPM "awips2-common-base" - #buildRPM "awips2-gfesuite-client" - #buildRPM "awips2-gfesuite-server" - #buildRPM "awips2-python-dynamicserialize" - #buildRPM "awips2-alertviz" - buildRPM "awips2-python" - #buildRPM "awips2-alertviz" - #buildRPM "awips2-ant" - #buildRPM "awips2-eclipse" - #buildRPM "awips2-python" - - exit 0 -fi - -if [ "${1}" = "-qpid" ]; then - buildRPM "awips2-python-qpid" - buildQPID - if [ $? -ne 0 ]; then - exit 1 - fi - - exit 0 -fi - -if [ "${1}" = "-ldm" ]; then - buildRPM "awips2-ldm" - - exit 0 -fi - -if [ "${1}" = "-package" ]; then - repository_directory="awips2-repository-${AWIPSII_VERSION}-${AWIPSII_RELEASE}" - if [ -d ${WORKSPACE}/${repository_directory} ]; then - rm -rf ${WORKSPACE}/${repository_directory} - if [ $? -ne 0 ]; then - exit 1 - fi - fi - mkdir -p ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE} - if [ $? -ne 0 ]; then - exit 1 - fi - - cp -r ${AWIPSII_TOP_DIR}/RPMS/* \ - ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE} - if [ $? -ne 0 ]; then - exit 1 - fi - - rpms_directory="${WORKSPACE}/rpms" - comps_xml="${rpms_directory}/common/yum/arch.x86_64/comps.xml" - cp -v ${comps_xml} ${WORKSPACE}/${repository_directory} - if [ $? -ne 0 ]; then - exit 1 - fi - - pushd . > /dev/null - cd ${WORKSPACE} - tar -cvf ${repository_directory}.tar ${repository_directory} - RC=$? - popd > /dev/null - if [ ${RC} -ne 0 ]; then - exit 1 - fi - - exit 0 -fi - if [ "${1}" = "-dev" ]; then if [ ! $# -eq 2 ]; then @@ -571,6 +293,5 @@ if [ "${1}" = "-dev" ]; then exit 0 fi - usage exit 0 diff --git a/rpms/python.site-packages/Installer.cherrypy/component.spec b/rpms/python.site-packages/Installer.cherrypy/component.spec index e4f127c464..9f35350d03 100644 --- a/rpms/python.site-packages/Installer.cherrypy/component.spec +++ b/rpms/python.site-packages/Installer.cherrypy/component.spec @@ -1,6 +1,7 @@ # Turn off the brp-python-bytecompile script %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') %define _build_arch %(uname -i) +%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python cherrypy Site-Package Spec File @@ -8,7 +9,7 @@ Name: awips2-python-cherrypy Summary: AWIPS II Python cherrypy Site-Package Version: 3.1.2 -Release: %{_component_version}.%{_component_release} +Release: 1%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: noarch @@ -16,11 +17,12 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: awips2-python -provides: awips2-python-cherrypy +Requires: awips2-python = %{_installed_python} +Provides: awips2-python-cherrypy = %{version} + +BuildRequires: awips2-python %description AWIPS II Python cherrypy Site-Package - Installs the AWIPS II Python diff --git a/rpms/python.site-packages/Installer.dynamicserialize/component.spec b/rpms/python.site-packages/Installer.dynamicserialize/component.spec index 6d0abd5fb9..4ca92a23aa 100644 --- a/rpms/python.site-packages/Installer.dynamicserialize/component.spec +++ b/rpms/python.site-packages/Installer.dynamicserialize/component.spec @@ -1,6 +1,7 @@ %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" +%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python dynamicserialize Spec File @@ -8,7 +9,7 @@ Name: awips2-python-dynamicserialize Summary: AWIPS II Python dynamicserialize Distribution Version: %{_component_version} -Release: %{_component_release} +Release: %{_component_release}%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: noarch @@ -16,12 +17,14 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: awips2-python -requires: awips2-python-thrift -provides: awips2-python-dynamicserialize +Requires: awips2-python = %{_installed_python} +Requires: awips2-python-thrift +Provides: awips2-python-dynamicserialize = %{version} + +BuildRequires: awips2-python +BuildRequires: awips2-python-thrift %description AWIPS II Python dynamicserialize Site-Package - 64-bit. diff --git a/rpms/python.site-packages/Installer.nose/component.spec b/rpms/python.site-packages/Installer.nose/component.spec index dfc54065b9..5ec128e1d0 100644 --- a/rpms/python.site-packages/Installer.nose/component.spec +++ b/rpms/python.site-packages/Installer.nose/component.spec @@ -2,6 +2,7 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python nose Spec File @@ -9,7 +10,7 @@ Name: awips2-python-nose Summary: AWIPS II Python nose Distribution Version: 0.11.1 -Release: %{_component_version}.%{_component_release} +Release: 1%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: noarch @@ -17,11 +18,12 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: awips2-python -provides: awips2-python-nose +Requires: awips2-python = %{_installed_python} +Provides: awips2-python-nose = %{version} + +BuildRequires: awips2-python %description AWIPS II Python nose Site-Package. diff --git a/rpms/python.site-packages/Installer.pil/component.spec b/rpms/python.site-packages/Installer.pil/component.spec index a455fa1dfc..1febaccb38 100644 --- a/rpms/python.site-packages/Installer.pil/component.spec +++ b/rpms/python.site-packages/Installer.pil/component.spec @@ -2,6 +2,7 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python pil Spec File @@ -9,7 +10,7 @@ Name: awips2-python-pil Summary: AWIPS II Python pil Distribution Version: 1.1.6 -Release: %{_component_version}.%{_component_release}%{?dist} +Release: 1%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: %{_build_arch} @@ -17,11 +18,14 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: awips2-python -provides: awips2-python-pil +Requires: awips2-python = %{_installed_python} +Requires: zlib +Provides: awips2-python-pil = %{version} + +BuildRequires: awips2-python +BuildRequires: zlib %description AWIPS II Python pil Site-Package. diff --git a/rpms/python.site-packages/Installer.pmw/component.spec b/rpms/python.site-packages/Installer.pmw/component.spec index bc5ef2c303..bb35b80059 100644 --- a/rpms/python.site-packages/Installer.pmw/component.spec +++ b/rpms/python.site-packages/Installer.pmw/component.spec @@ -2,6 +2,7 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python pmw Spec File @@ -9,7 +10,7 @@ Name: awips2-python-pmw Summary: AWIPS II Python pmw Distribution Version: 1.3.2 -Release: %{_component_version}.%{_component_release} +Release: 1%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: %{_build_arch} @@ -17,11 +18,12 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: awips2-python -provides: awips2-python-pmw +Requires: awips2-python = %{_installed_python} +Provides: awips2-python-pmw = %{version} + +BuildRequires: awips2-python %description AWIPS II Python pmw Site-Package diff --git a/rpms/python.site-packages/Installer.pupynere/component.spec b/rpms/python.site-packages/Installer.pupynere/component.spec index c841302981..f27d1bdee9 100644 --- a/rpms/python.site-packages/Installer.pupynere/component.spec +++ b/rpms/python.site-packages/Installer.pupynere/component.spec @@ -2,6 +2,8 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) +%define _installed_python_numpy %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c "import numpy; print numpy.__version__"; else echo 0; fi) # # AWIPS II Python pupynere Spec File @@ -9,7 +11,7 @@ Name: awips2-python-pupynere Summary: AWIPS II Python pupynere Distribution Version: 1.0.13 -Release: %{_component_version}.%{_component_release} +Release: 1%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: noarch @@ -17,12 +19,15 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: awips2-python -requires: awips2-python-numpy -provides: awips2-python-pupynere +Requires: awips2-python = %{_installed_python} +Requires: awips2-python-numpy = %{_installed_python_numpy} +Provides: awips2-python-pupynere = %{version} + +BuildRequires: awips2-python +BuildRequires: awips2-python-numpy +BuildRequires: awips2-python-setuptools %description AWIPS II Python pupynere Site-Package diff --git a/rpms/python.site-packages/Installer.pycairo/component.spec b/rpms/python.site-packages/Installer.pycairo/component.spec index 958722c783..f475d90759 100644 --- a/rpms/python.site-packages/Installer.pycairo/component.spec +++ b/rpms/python.site-packages/Installer.pycairo/component.spec @@ -2,6 +2,7 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python pycairo Spec File @@ -9,7 +10,7 @@ Name: awips2-python-pycairo Summary: AWIPS II Python pycairo Distribution Version: 1.2.2 -Release: %{_component_version}.%{_component_release} +Release: 1%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: %{_build_arch} @@ -17,11 +18,12 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: awips2-python -provides: awips2-python-pycairo +Requires: awips2-python = %{_installed_python} +Provides: awips2-python-pycairo = %{version} + +BuildRequires: awips2-python %description AWIPS II Python pycairo Site-Package. diff --git a/rpms/python.site-packages/Installer.pygtk/component.spec b/rpms/python.site-packages/Installer.pygtk/component.spec index 13fc8e0484..45e3ba29eb 100644 --- a/rpms/python.site-packages/Installer.pygtk/component.spec +++ b/rpms/python.site-packages/Installer.pygtk/component.spec @@ -2,6 +2,7 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python pygtk Spec File @@ -9,7 +10,7 @@ Name: awips2-python-pygtk Summary: AWIPS II Python pygtk Distribution Version: 2.8.6 -Release: %{_component_version}.%{_component_release} +Release: 1%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: %{_build_arch} @@ -17,12 +18,14 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: awips2-python -requires: awips2-python-pycairo -provides: awips2-python-pygtk +Requires: awips2-python = %{_installed_python} +Requires: awips2-python-pycairo +Provides: awips2-python-pygtk = %{version} + +BuildRequires: awips2-python +BuildRequires: awips2-python-pycairo %description AWIPS II Python pygtk Site-Package. diff --git a/rpms/python.site-packages/Installer.thrift/component.spec b/rpms/python.site-packages/Installer.thrift/component.spec index ac90cc7f6f..f518fc0788 100644 --- a/rpms/python.site-packages/Installer.thrift/component.spec +++ b/rpms/python.site-packages/Installer.thrift/component.spec @@ -1,6 +1,7 @@ %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" +%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python thrift Spec File @@ -8,7 +9,7 @@ Name: awips2-python-thrift Summary: AWIPS II Python thrift Distribution Version: 20080411p1 -Release: %{_component_version}.%{_component_release} +Release: 1%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: noarch @@ -16,11 +17,12 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: awips2-python -provides: awips2-python-thrift +requires: awips2-python = %{_installed_python} +provides: awips2-python-thrift = %{version} + +BuildRequires: awips2-python %description AWIPS II Python thrift Site-Package diff --git a/rpms/python.site-packages/Installer.tpg/component.spec b/rpms/python.site-packages/Installer.tpg/component.spec index 229149b4ef..bba96c85a8 100644 --- a/rpms/python.site-packages/Installer.tpg/component.spec +++ b/rpms/python.site-packages/Installer.tpg/component.spec @@ -2,6 +2,7 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python tpg Spec File @@ -9,7 +10,7 @@ Name: awips2-python-tpg Summary: AWIPS II Python tpg Distribution Version: 3.1.2 -Release: %{_component_version}.%{_component_release} +Release: 1%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: noarch @@ -17,11 +18,12 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: awips2-python -provides: awips2-python-tpg +requires: awips2-python = %{_installed_python} +provides: awips2-python-tpg = %{version} + +BuildRequires: awips2-python %description AWIPS II Python tpg Site-Package diff --git a/rpms/python.site-packages/Installer.ufpy/component.spec b/rpms/python.site-packages/Installer.ufpy/component.spec index eb0dec9f74..3cb80399fe 100644 --- a/rpms/python.site-packages/Installer.ufpy/component.spec +++ b/rpms/python.site-packages/Installer.ufpy/component.spec @@ -1,6 +1,7 @@ %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" +%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python ufpy Spec File @@ -8,7 +9,7 @@ Name: awips2-python-ufpy Summary: AWIPS II Python ufpy Distribution Version: %{_component_version} -Release: %{_component_release} +Release: %{_component_release}%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: noarch @@ -16,11 +17,12 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: awips2-python -provides: awips2-python-ufpy +Requires: awips2-python = %{_installed_python} +Provides: awips2-python-ufpy = %{version} + +BuildRequires: awips2-python %description AWIPS II Python ufpy Site-Package - 64-bit. diff --git a/rpms/python.site-packages/Installer.werkzeug/component.spec b/rpms/python.site-packages/Installer.werkzeug/component.spec index af5dbd6782..388abe0311 100644 --- a/rpms/python.site-packages/Installer.werkzeug/component.spec +++ b/rpms/python.site-packages/Installer.werkzeug/component.spec @@ -2,14 +2,15 @@ %define _build_arch %(uname -i) %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi) # # AWIPS II Python werkzeug Spec File # Name: awips2-python-werkzeug Summary: AWIPS II Python werkzeug Distribution -Version: 3.1.2 -Release: %{_component_version}.%{_component_release} +Version: 0.6.2 +Release: 1%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: noarch @@ -17,11 +18,12 @@ URL: N/A License: N/A Distribution: N/A Vendor: Raytheon -Packager: Bryan Kowal AutoReq: no -requires: awips2-python -provides: awips2-python-werkzeug +Requires: awips2-python = %{_installed_python} +Provides: awips2-python-werkzeug = %{version} + +BuildRequires: awips2-python %description AWIPS II Python werkzeug Site-Package