Browse code

update mesos to 1.2.0

Change-Id: I240d846e99e654967a731bbae97839e9cc89cd8a
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3691
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

Priyesh Padmavilasom authored on 2017/09/02 07:01:33
Showing 1 changed files
... ...
@@ -1,14 +1,16 @@
1
+%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
+
1 3
 Summary:	Mesos
2 4
 Name:		mesos
3
-Version:	0.28.2
4
-Release:	3%{?dist}
5
+Version:	1.2.0
6
+Release:	1%{?dist}
5 7
 License:	Apache
6 8
 URL:		http://mesos.apache.org
7 9
 Group:		Applications/System
8 10
 Vendor:		VMware, Inc.
9 11
 Distribution: 	Photon
10 12
 Source0:	http://www.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz
11
-%define sha1 mesos=a8675ef59b4c34d4337553215a5295eebf2e4265
13
+%define sha1 mesos=1d570504498c90697b690e3b221feba63d0a800b
12 14
 BuildRequires:	openjre >= %{JAVA_VERSION}
13 15
 BuildRequires:  openjdk >= %{JAVA_VERSION}
14 16
 BuildRequires:	curl
... ...
@@ -55,8 +57,10 @@ Requires:	%{name} = %{version}
55 55
 %setup -q
56 56
 
57 57
 %build
58
-sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/Makefile.in
59
-sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/libprocess/3rdparty/Makefile.in
58
+sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/Makefile.am
59
+sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/libprocess/3rdparty/Makefile.am
60
+sed -i "/xlocale.h/d" 3rdparty/stout/include/stout/jsonify.hpp
61
+
60 62
 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
61 63
 ./configure \
62 64
 	CFLAGS="%{optflags} -Wno-deprecated-declarations"  \
... ...
@@ -79,31 +83,35 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
79 79
 %files
80 80
 %defattr(-,root,root)
81 81
 %{_bindir}/mesos*
82
+%exclude %{_bindir}/easy_install
83
+%exclude %{_bindir}/easy_install-2.7
82 84
 %{_sbindir}/mesos-*
83 85
 %{_libdir}/libmesos*
84 86
 %{_libexecdir}/mesos/mesos-*
85 87
 %{_prefix}/etc/mesos/*
86 88
 %{_prefix}/share/mesos/*
87
-%{_libdir}/libload_qos_controller-0.28.2.so
89
+%{_libdir}/libload_qos_controller-*.so
88 90
 %{_libdir}/libload_qos_controller.so
89
-%{_libdir}/liblogrotate_container_logger-0.28.2.so
91
+%{_libdir}/liblogrotate_container_logger-*.so
90 92
 %{_libdir}/liblogrotate_container_logger.so
91
-%{_libdir}/mesos/modules/libfixed_resource_estimator-0.28.2.so
93
+%{_libdir}/mesos/modules/libfixed_resource_estimator-*.so
92 94
 %{_libdir}/mesos/modules/libfixed_resource_estimator.so
93
-%{_libdir}/mesos/modules/libload_qos_controller-0.28.2.so
95
+%{_libdir}/mesos/modules/libload_qos_controller-*.so
94 96
 %{_libdir}/mesos/modules/libload_qos_controller.so
95
-%{_libdir}/mesos/modules/liblogrotate_container_logger-0.28.2.so
97
+%{_libdir}/mesos/modules/liblogrotate_container_logger-*.so
96 98
 %{_libdir}/mesos/modules/liblogrotate_container_logger.so
97 99
 
98 100
 %files devel
99 101
 %{_includedir}/*
100 102
 %{_libdir}/libfixed_resource_estimator*
101 103
 %{_libdir}/pkgconfig/mesos.pc
102
-%{_libdir}/python2.7/site-packages/*
104
+%{python2_sitelib}/*
103 105
 %{_prefix}/etc/mesos/*
104 106
 %exclude %{_libdir}/debug/
105 107
 
106 108
 %changelog
109
+*	Fri Sep 1 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.0-1
110
+-	Update to 1.2.0-1
107 111
 *	Fri May 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.28.2-3
108 112
 -	Use JAVA_VERSION macro instead of hard coding version.
109 113
 *	Mon Apr 24 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.28.2-2