summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-05-14 23:32:16 -0400
committerFeng Pan <fpan@redhat.com>2016-05-20 21:28:46 +0000
commitd0fbaceb1e2c2ecce60dcdc51c59cb515810e355 (patch)
tree9c12197a127a33aaefac9597574a754049ba6915 /build
parent967243a0bb93972820eecafdfb2c925b5fe81420 (diff)
Fix python3 dependency in spec file
Change python compiler from system default (python 2) to explicit python3 during RPM build for apex common rpm. Change-Id: Ib979909c0987bceade9b65baabf2de0482aede46 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'build')
-rw-r--r--build/opnfv-apex-common.spec13
1 files changed, 6 insertions, 7 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec
index 8048dea8..0e44ebbc 100644
--- a/build/opnfv-apex-common.spec
+++ b/build/opnfv-apex-common.spec
@@ -24,6 +24,8 @@ https://wiki.opnfv.org/apex
rst2html docs/installation-instructions/index.rst docs/installation-instructions.html
rst2html docs/release-notes/release-notes.rst docs/release-notes.html
+%global __python %{__python3}
+
%install
mkdir -p %{buildroot}%{_bindir}/
install ci/deploy.sh %{buildroot}%{_bindir}/opnfv-deploy
@@ -66,13 +68,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
%attr(755,root,root) %{_bindir}/opnfv-util
%{_var}/opt/opnfv/lib/common-functions.sh
%{_var}/opt/opnfv/lib/utility-functions.sh
-%{_var}/opt/opnfv/lib/python/apex-python-utils.py
-%{_var}/opt/opnfv/lib/python/apex-python-utils.pyo
-%{_var}/opt/opnfv/lib/python/apex-python-utils.pyc
-%{python3_sitelib}/apex/ip_utils.py
-%{python3_sitelib}/apex/net_env.py
-%{python3_sitelib}/apex/__init__.py
-%{python3_sitelib}/apex/__pycache__/*
+%{_var}/opt/opnfv/lib/python/
+%{python3_sitelib}/apex/
%{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh
%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml
%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
@@ -90,6 +87,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
%doc %{_docdir}/opnfv/inventory.yaml.example
%changelog
+* Sun May 15 2016 Feng Pan <fpan@redhat.com> - 3.0-5
+- Fixes python3 dependency.
* Sun May 8 2016 Feng Pan <fpan@redhat.com> - 3.0-4
- Adds dependency for python34-setuptools
* Fri Apr 22 2016 Feng Pan <fpan@redhat.com> - 3.0-3