Browse code
fix mesos conflicts with 0.28
Change-Id: Ia2187a6426e149f697e43604f0408da0c2686bb6
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3965
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sarah Choi <sarahc@vmware.com>
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Priyesh Padmavilasomb authored on 2017/10/05 09:16:55Showing 1 changed files
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: Mesos |
| 4 | 4 |
Name: mesos |
| 5 | 5 |
Version: 1.2.0 |
| 6 |
-Release: 2%{?dist}
|
|
| 6 |
+Release: 3%{?dist}
|
|
| 7 | 7 |
License: Apache |
| 8 | 8 |
URL: http://mesos.apache.org |
| 9 | 9 |
Group: Applications/System |
| ... | ... |
@@ -55,6 +55,7 @@ Requires: %{name} = %{version}-%{release}
|
| 55 | 55 |
Summary: python bindings for mesos |
| 56 | 56 |
Requires: python2 |
| 57 | 57 |
Requires: protobuf-python |
| 58 |
+Conflicts: mesos-devel < 1.2.0 |
|
| 58 | 59 |
%description python |
| 59 | 60 |
python bindings for mesos |
| 60 | 61 |
|
| ... | ... |
@@ -111,6 +112,7 @@ find %{buildroot}%{python2_sitelib}/mesos -name '*.pyc' -delete
|
| 111 | 111 |
%{_libdir}/mesos/modules/liblogrotate_container_logger.so
|
| 112 | 112 |
|
| 113 | 113 |
%files devel |
| 114 |
+%exclude %{_includedir}/mesos/slave
|
|
| 114 | 115 |
%{_includedir}/*
|
| 115 | 116 |
%{_libdir}/libfixed_resource_estimator*
|
| 116 | 117 |
%{_libdir}/pkgconfig/mesos.pc
|
| ... | ... |
@@ -121,6 +123,8 @@ find %{buildroot}%{python2_sitelib}/mesos -name '*.pyc' -delete
|
| 121 | 121 |
%{python2_sitelib}/mesos/*
|
| 122 | 122 |
|
| 123 | 123 |
%changelog |
| 124 |
+* Thu Sep 21 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.0-3 |
|
| 125 |
+- fix conflicts with mesos-0.28 |
|
| 124 | 126 |
* Thu Sep 21 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.0-2 |
| 125 | 127 |
- for python files, package only mesos python files. |
| 126 | 128 |
* Fri Sep 1 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.0-1 |