summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Teselkin <dteselkin@mirantis.com>2015-10-30 08:58:45 +0300
committerDmitry Teselkin <dteselkin@mirantis.com>2015-11-27 15:28:52 +0300
commit0b1b94a9685c6471d6911dff7ecac10b7bd2625f (patch)
tree256a15ec97a10b9dc1e75cde9e9d513569e88a14
parent2c62cd52655ea6456ff6294fd63f18d6ea54fe38 (diff)
Make spec compatible with CentOS 7
CentOS 7 comes with Python 2.7 by default, which has argparse in standard library, thus requiring this package is not needed. Also, CentOS 7 abandoned vconfig in favor of ip. Blueprint: master-on-centos7 Compatible with CentOS6 master node Co-Authored-By: Dmitry Teselkin <dteselkin@mirantis.com> Change-Id: I794518e90a412110222f7ed0c53a9c014060e636
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Vladimir Kozhukalov <vkozhukalov@mirantis.com> Workflow+1: Vladimir Kozhukalov <vkozhukalov@mirantis.com> Code-Review+1: Dmitry Burmistrov <dburmistrov@mirantis.com> Code-Review+1: Sergey Kulanov <skulanov@mirantis.com> Submitted-by: Jenkins Submitted-at: Fri, 27 Nov 2015 13:00:21 +0000 Reviewed-on: https://review.openstack.org/240432 Project: openstack/network-checker Branch: refs/heads/master
-rw-r--r--specs/network-checker.spec11
1 files changed, 8 insertions, 3 deletions
diff --git a/specs/network-checker.spec b/specs/network-checker.spec
index 9063b59..df1f6bb 100644
--- a/specs/network-checker.spec
+++ b/specs/network-checker.spec
@@ -2,7 +2,7 @@
2%{!?version: %define version 8.0.0} 2%{!?version: %define version 8.0.0}
3 3
4Name: %{name} 4Name: %{name}
5Summary: Network checking package for CentOS6.x 5Summary: Network checking package for CentOS
6Version: %{version} 6Version: %{version}
7Release: 1%{?dist}~mos8.0.0 7Release: 1%{?dist}~mos8.0.0
8Source0: %{name}-%{version}.tar.gz 8Source0: %{name}-%{version}.tar.gz
@@ -10,9 +10,11 @@ License: GPLv2
10Obsoletes: nailgun-net-check 10Obsoletes: nailgun-net-check
11BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot 11BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
12URL: http://github.com/Mirantis 12URL: http://github.com/Mirantis
13Requires: vconfig
14Requires: scapy 13Requires: scapy
15Requires: python-argparse 14%if 0%{?rhel} == 6
15Requires: python-argparse
16Requires: vconfig
17%endif
16Requires: python-pypcap 18Requires: python-pypcap
17Requires: python-cliff-tablib 19Requires: python-cliff-tablib
18Requires: python-stevedore 20Requires: python-stevedore
@@ -45,5 +47,8 @@ rm -rf $RPM_BUILD_ROOT
45%defattr(-,root,root) 47%defattr(-,root,root)
46 48
47%changelog 49%changelog
50* Thu Nov 19 2015 Aleksandr Mogylchenko <amogylchenko@mirantis.com> 8.0.1-1
51- make spec compatible with CentOS 7
52
48* Wed Oct 28 2015 Vladimir Kozhukalov <vkozhukalov@mirantis.com> 8.0.0-1 53* Wed Oct 28 2015 Vladimir Kozhukalov <vkozhukalov@mirantis.com> 8.0.0-1
49- The RPM spec was extracted from fuel-web/specs/fuel-nailgun.spec 54- The RPM spec was extracted from fuel-web/specs/fuel-nailgun.spec