Change-Id: I99b37e95d4a2a7973b25f43cc0816ad4746a986c
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1724
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: suezzelur <anishs@vmware.com>
... | ... |
@@ -1,7 +1,7 @@ |
1 | 1 |
Summary: Open vSwitch daemon/database/utilities |
2 | 2 |
Name: openvswitch |
3 |
-Version: 2.4.0 |
|
4 |
-Release: 3%{?dist} |
|
3 |
+Version: 2.6.1 |
|
4 |
+Release: 1%{?dist} |
|
5 | 5 |
License: ASL 2.0 and LGPLv2+ |
6 | 6 |
URL: http://www.openvswitch.org/ |
7 | 7 |
Group: System Environment/Daemons |
... | ... |
@@ -9,16 +9,19 @@ Vendor: VMware, Inc. |
9 | 9 |
Distribution: Photon |
10 | 10 |
|
11 | 11 |
Source0: http://openvswitch.org/releases/%{name}-%{version}.tar.gz |
12 |
-%define sha1 openvswitch=d091902579cf5101df851d2ec69c75a6bcbd49fc |
|
12 |
+%define sha1 openvswitch=2865fe03b3906b5aea984102c4b65772b5dd7450 |
|
13 | 13 |
|
14 | 14 |
BuildRequires: gcc >= 4.0.0 |
15 | 15 |
BuildRequires: libcap-ng |
16 |
+BuildRequires: libcap-ng-devel |
|
16 | 17 |
BuildRequires: make |
17 | 18 |
BuildRequires: openssl |
18 | 19 |
BuildRequires: openssl-devel |
19 | 20 |
BuildRequires: python2 >= 2.7.0 |
20 | 21 |
BuildRequires: python2-devel |
21 | 22 |
BuildRequires: python2-libs |
23 |
+BuildRequires: python-pip |
|
24 |
+BuildRequires: python-six |
|
22 | 25 |
BuildRequires: python-xml |
23 | 26 |
BuildRequires: python-setuptools |
24 | 27 |
|
... | ... |
@@ -102,6 +105,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} |
102 | 102 |
%defattr(-,root,root) |
103 | 103 |
%{_bindir}/ovs-* |
104 | 104 |
%{_bindir}/ovsdb-* |
105 |
+%{_bindir}/ovn-* |
|
105 | 106 |
%{_bindir}/vtep-ctl |
106 | 107 |
%{_sbindir}/ovs-* |
107 | 108 |
%{_sbindir}/ovsdb-server |
... | ... |
@@ -111,8 +115,10 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} |
111 | 111 |
/usr/share/openvswitch/bugtool-plugins/* |
112 | 112 |
/usr/share/openvswitch/python/* |
113 | 113 |
/usr/share/openvswitch/scripts/ovs-* |
114 |
+/usr/share/openvswitch/scripts/ovn-* |
|
114 | 115 |
|
115 | 116 |
%files devel |
117 |
+%{_includedir}/ovn/*.h |
|
116 | 118 |
%{_includedir}/openflow/*.h |
117 | 119 |
%{_includedir}/openvswitch/*.h |
118 | 120 |
%{_libdir}/*.a |
... | ... |
@@ -122,11 +128,16 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} |
122 | 122 |
/usr/share/man/man1/ovs-*.1.gz |
123 | 123 |
/usr/share/man/man1/ovsdb-*.1.gz |
124 | 124 |
/usr/share/man/man5/ovs-vswitchd.conf.db.5.gz |
125 |
+/usr/share/man/man5/ovn-*.5.gz |
|
125 | 126 |
/usr/share/man/man5/vtep.5.gz |
127 |
+/usr/share/man/man7/ovn-architecture.7.gz |
|
126 | 128 |
/usr/share/man/man8/ovs-*.8.gz |
129 |
+/usr/share/man/man8/ovn-*.8.gz |
|
127 | 130 |
/usr/share/man/man8/vtep-ctl.8.gz |
128 | 131 |
|
129 | 132 |
%changelog |
133 |
+* Wed Nov 16 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-1 |
|
134 |
+- Update to openvswitch 2.6.1 |
|
130 | 135 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.0-3 |
131 | 136 |
- GA - Bump release of all rpms |
132 | 137 |
* Sat Oct 31 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.0-2 |
133 | 138 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,43 @@ |
0 |
+Name: python-pip |
|
1 |
+Version: 8.1.2 |
|
2 |
+Release: 1%{?dist} |
|
3 |
+Url: https://pypi.python.org/pypi/pip |
|
4 |
+Summary: The PyPA recommended tool for installing Python packages. |
|
5 |
+License: MIT |
|
6 |
+Group: Development/Languages/Python |
|
7 |
+Vendor: VMware, Inc. |
|
8 |
+Distribution: Photon |
|
9 |
+Source0: https://pypi.python.org/packages/e7/a8/7556133689add8d1a54c0b14aeff0acb03c64707ce100ecd53934da1aa13/pip-%{version}.tar.gz |
|
10 |
+%define sha1 pip=910e2dd5c533d351a7dc84bc9091893659afcbb0 |
|
11 |
+BuildRequires: python2 |
|
12 |
+BuildRequires: python2-libs |
|
13 |
+BuildRequires: python-setuptools |
|
14 |
+ |
|
15 |
+Requires: python2 |
|
16 |
+Requires: python2-libs |
|
17 |
+ |
|
18 |
+%description |
|
19 |
+The PyPA recommended tool for installing Python packages. |
|
20 |
+ |
|
21 |
+ |
|
22 |
+%prep |
|
23 |
+%setup -q -n pip-%{version} |
|
24 |
+ |
|
25 |
+%build |
|
26 |
+python setup.py build |
|
27 |
+ |
|
28 |
+%install |
|
29 |
+python setup.py install --prefix=%{_prefix} --root=%{buildroot} |
|
30 |
+ |
|
31 |
+%check |
|
32 |
+easy_install freezegun |
|
33 |
+%{__python} setup.py test |
|
34 |
+ |
|
35 |
+%files |
|
36 |
+%defattr(-,root,root) |
|
37 |
+%{python_sitelib}/* |
|
38 |
+%{_bindir}/* |
|
39 |
+ |
|
40 |
+%changelog |
|
41 |
+* Fri Sep 2 2016 Xiaolin Li <xiaolinl@vmware.com> 8.1.2-1 |
|
42 |
+- Initial packaging for Photon |