Browse code
Update setuptools and use photon python-setuptools to build mesos. (Bug 1652301)
Change-Id: I653941f551ea24a4de7bb08ef6bcfc364878ce48
Reviewed-on: http://photon-jenkins.eng.vmware.com/805
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>
xiaolin-vmware authored on 2016/05/05 03:05:07Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Mesos |
| 2 | 2 |
Name: mesos |
| 3 | 3 |
Version: 0.24.0 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: Apache |
| 6 | 6 |
URL: http://mesos.apache.org |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -24,6 +24,7 @@ BuildRequires: python2 >= 2.6 |
| 24 | 24 |
BuildRequires: python2-libs |
| 25 | 25 |
BuildRequires: python-xml |
| 26 | 26 |
BuildRequires: python2-devel |
| 27 |
+BuildRequires: python-setuptools |
|
| 27 | 28 |
Requires: apr >= 1.5.2 |
| 28 | 29 |
Requires: apr-util >= 1.5.4 |
| 29 | 30 |
Requires: cyrus-sasl >= 2.1.26 |
| ... | ... |
@@ -31,6 +32,7 @@ Requires: expat |
| 31 | 31 |
Requires: openjre >= 1.8.0.45 |
| 32 | 32 |
Requires: subversion >= 1.8.13 |
| 33 | 33 |
|
| 34 |
+ |
|
| 34 | 35 |
%description |
| 35 | 36 |
This package installs mesos services that allow photon to run tasks in mesos |
| 36 | 37 |
framework. |
| ... | ... |
@@ -68,7 +70,6 @@ make DESTDIR=%{buildroot} install
|
| 68 | 68 |
%files |
| 69 | 69 |
%defattr(-,root,root) |
| 70 | 70 |
%{_bindir}/mesos*
|
| 71 |
-%{_bindir}/easy*
|
|
| 72 | 71 |
%{_sbindir}/mesos-*
|
| 73 | 72 |
%{_libdir}/libmesos*
|
| 74 | 73 |
%{_libexecdir}/mesos/mesos-*
|
| ... | ... |
@@ -84,6 +85,8 @@ make DESTDIR=%{buildroot} install
|
| 84 | 84 |
%exclude %{_libdir}/debug/
|
| 85 | 85 |
|
| 86 | 86 |
%changelog |
| 87 |
+* Tue May 3 2016 Xiaolin Li <xiaolinl@vmware.com> 0.24.0-2 |
|
| 88 |
+- Add python-setuptools to build requires. |
|
| 87 | 89 |
* Fri Sep 18 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.24.0-1 |
| 88 | 90 |
- Upgrade to mesos 0.24.0 |
| 89 | 91 |
* Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar.com> 0.23.0-3 |
| ... | ... |
@@ -1,13 +1,13 @@ |
| 1 | 1 |
Summary: Download, build, install, upgrade, and uninstall Python packages |
| 2 | 2 |
Name: python-setuptools |
| 3 |
-Version: 12.4 |
|
| 3 |
+Version: 21.0.0 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: Python or ZPLv2.0 |
| 6 | 6 |
Group: Development/Languages |
| 7 | 7 |
URL: https://pypi.python.org/pypi/setuptools |
| 8 | 8 |
|
| 9 | 9 |
Source0: https://pypi.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
|
| 10 |
-%define sha1 setuptools=427e916ad99a704af54b7aa3124bd52d4ebf04d3 |
|
| 10 |
+%define sha1 setuptools=38f9bd98b2c36bd4bae64ea06495e35e43b09b43 |
|
| 11 | 11 |
|
| 12 | 12 |
BuildArch: noarch |
| 13 | 13 |
|
| ... | ... |
@@ -42,10 +42,11 @@ chmod +x %{buildroot}%{python_sitelib}/setuptools/command/easy_install.py
|
| 42 | 42 |
|
| 43 | 43 |
%files |
| 44 | 44 |
%defattr(-, root, root) |
| 45 |
-%doc *.txt |
|
| 46 | 45 |
%{_bindir}/*
|
| 47 | 46 |
%{python_sitelib}/*
|
| 48 | 47 |
|
| 49 | 48 |
%changelog |
| 49 |
+* Wed May 4 2016 Xiaolin Li <xiaolinl@vmware.com> 21.0.0-1 |
|
| 50 |
+- Update setuptools to version 21.0.0 |
|
| 50 | 51 |
* Wed Feb 11 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> |
| 51 | 52 |
- Initial packaging for Photon |