diff --git a/rpms/python.site-packages/Installer.cherrypy/component.spec b/rpms/python.site-packages/Installer.cherrypy/component.spec index 388e0b5ec1..a20e3b79fb 100644 --- a/rpms/python.site-packages/Installer.cherrypy/component.spec +++ b/rpms/python.site-packages/Installer.cherrypy/component.spec @@ -1,7 +1,6 @@ # 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 diff --git a/rpms/python.site-packages/Installer.nose/component.spec b/rpms/python.site-packages/Installer.nose/component.spec index dbd46bac91..f54b92a0a0 100644 --- a/rpms/python.site-packages/Installer.nose/component.spec +++ b/rpms/python.site-packages/Installer.nose/component.spec @@ -2,7 +2,6 @@ %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 diff --git a/rpms/python.site-packages/Installer.pmw/component.spec b/rpms/python.site-packages/Installer.pmw/component.spec index 0e3cef0a88..6085935122 100644 --- a/rpms/python.site-packages/Installer.pmw/component.spec +++ b/rpms/python.site-packages/Installer.pmw/component.spec @@ -2,7 +2,6 @@ %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 @@ -21,7 +20,7 @@ Vendor: %{_build_vendor} Packager: %{_build_site} AutoReq: no -Requires: awips2-python = %{_installed_python} +Requires: awips2-python Provides: awips2-python-pmw = %{version} BuildRequires: awips2-python diff --git a/rpms/python.site-packages/Installer.pupynere/component.spec b/rpms/python.site-packages/Installer.pupynere/component.spec index 96478351e5..0dbd370e15 100644 --- a/rpms/python.site-packages/Installer.pupynere/component.spec +++ b/rpms/python.site-packages/Installer.pupynere/component.spec @@ -2,8 +2,6 @@ %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 @@ -22,8 +20,8 @@ Vendor: %{_build_vendor} Packager: %{_build_site} AutoReq: no -Requires: awips2-python = %{_installed_python} -Requires: awips2-python-numpy = %{_installed_python_numpy} +Requires: awips2-python +Requires: awips2-python-numpy Provides: awips2-python-pupynere = %{version} BuildRequires: awips2-python diff --git a/rpms/python.site-packages/Installer.python-awips/component.spec b/rpms/python.site-packages/Installer.python-awips/component.spec index 9c372004fe..02f5d9ac1b 100644 --- a/rpms/python.site-packages/Installer.python-awips/component.spec +++ b/rpms/python.site-packages/Installer.python-awips/component.spec @@ -8,7 +8,7 @@ # Name: awips2-python-awips Summary: AWIPS II Python awips Distribution -Version: 0.9.5 +Version: 0.9.7 Release: 1 Group: AWIPSII BuildRoot: %{_build_root} diff --git a/rpms/python.site-packages/Installer.tpg/component.spec b/rpms/python.site-packages/Installer.tpg/component.spec index 59526aba20..f2f56d42ee 100644 --- a/rpms/python.site-packages/Installer.tpg/component.spec +++ b/rpms/python.site-packages/Installer.tpg/component.spec @@ -2,7 +2,6 @@ %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 @@ -21,7 +20,7 @@ Vendor: %{_build_vendor} Packager: %{_build_site} AutoReq: no -requires: awips2-python = %{_installed_python} +requires: awips2-python provides: awips2-python-tpg = %{version} BuildRequires: awips2-python diff --git a/rpms/python.site-packages/Installer.werkzeug/component.spec b/rpms/python.site-packages/Installer.werkzeug/component.spec index 8df2b9f808..ddf4d4dd6b 100644 --- a/rpms/python.site-packages/Installer.werkzeug/component.spec +++ b/rpms/python.site-packages/Installer.werkzeug/component.spec @@ -2,7 +2,6 @@ %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 @@ -21,7 +20,7 @@ Vendor: %{_build_vendor} Packager: %{_build_site} AutoReq: no -Requires: awips2-python = %{_installed_python} +Requires: awips2-python Provides: awips2-python-werkzeug = %{version} BuildRequires: awips2-python