1. photon
  2. Commit f11b4791074ad7166b645a3ff0f6aad6107bb381
Browse code

Updating Python3, version in cython3,libxml2,ceph,python-greenlet,protobuf

Change-Id: Ia7b55507db2893494cdec6fe62d11300382075e0
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2534
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

smaliakkal authored on 2017/04/27 05:34:22
Showing 6 changed files
SPECS/ceph/ceph.spec
History View file @ f11b479
... ... 
@@ -13,7 +13,7 @@
13 13 
 #################################################################################
14 14 
 Name:		ceph
15 15 
 Version:	11.2.0
16 
-Release:	4%{?dist}
16 
+Release:	5%{?dist}
17 17 
 Epoch:		1
18 18 
 Summary:	User space components of the Ceph file system
19 19 
 License:	LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
... ... 
@@ -871,8 +871,8 @@ fi
871 871
872 872 
 %files -n python3-rados
873 873 
 %defattr(-,root,root,-)
874 
-%{_libdir}/python3.5/site-packages/rados.cpython*.so
875 
-%{_libdir}/python3.5/site-packages/rados-*.egg-info
874 
+%{_libdir}/python3.6/site-packages/rados.cpython*.so
875 
+%{_libdir}/python3.6/site-packages/rados-*.egg-info
876 876
877 877 
 %files -n libradosstriper1
878 878 
 %defattr(-,root,root,-)
... ... 
@@ -941,8 +941,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
941 941
942 942 
 %files -n python3-rgw
943 943 
 %defattr(-,root,root,-)
944 
-%{_libdir}/python3.5/site-packages/rgw.cpython*.so
945 
-%{_libdir}/python3.5/site-packages/rgw-*.egg-info
944 
+%{_libdir}/python3.6/site-packages/rgw.cpython*.so
945 
+%{_libdir}/python3.6/site-packages/rgw-*.egg-info
946 946
947 947 
 %files -n python-rbd
948 948 
 %defattr(-,root,root,-)
... ... 
@@ -951,8 +951,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
951 951
952 952 
 %files -n python3-rbd
953 953 
 %defattr(-,root,root,-)
954 
-%{_libdir}/python3.5/site-packages/rbd.cpython*.so
955 
-%{_libdir}/python3.5/site-packages/rbd-*.egg-info
954 
+%{_libdir}/python3.6/site-packages/rbd.cpython*.so
955 
+%{_libdir}/python3.6/site-packages/rbd-*.egg-info
956 956
957 957 
 %files -n libcephfs2
958 958 
 %defattr(-,root,root,-)
... ... 
@@ -979,14 +979,14 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
979 979
980 980 
 %files -n python3-cephfs
981 981 
 %defattr(-,root,root,-)
982 
-%{_libdir}/python3.5/site-packages/cephfs.cpython*.so
983 
-%{_libdir}/python3.5/site-packages/cephfs-*.egg-info
984 
-%{_libdir}/python3.5/site-packages/ceph_volume_client.py
982 
+%{_libdir}/python3.6/site-packages/cephfs.cpython*.so
983 
+%{_libdir}/python3.6/site-packages/cephfs-*.egg-info
984 
+%{_libdir}/python3.6/site-packages/ceph_volume_client.py
985 985
986 986 
 %files -n python3-ceph-argparse
987 987 
 %defattr(-,root,root,-)
988 
-%{_libdir}/python3.5/site-packages/ceph_argparse.py
989 
-%{_libdir}/python3.5/site-packages/ceph_daemon.py
988 
+%{_libdir}/python3.6/site-packages/ceph_argparse.py
989 
+%{_libdir}/python3.6/site-packages/ceph_daemon.py
990 990
991 991
992 992 
 %files -n python-ceph-compat
... ... 
@@ -995,6 +995,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
995 995
996 996
997 997 
 %changelog
998 
+* Thu Apr 27 2017 Siju Maliakkal <smaliakkal@vmware.com> 11.2.0-5
999 
+- updated python3 version
998 1000 
 * Wed Mar 15 2017 Dheeraj Shetty <Dheerajs@vmware.com> 11.2.0-4
999 1001 
 - corrected version number
1000 1002 
 * Mon Mar 13 2017 Dheeraj Shetty <Dheerajs@vmware.com> 11.2.0-3
SPECS/cython3/cython3.spec
History View file @ f11b479
... ... 
@@ -1,8 +1,8 @@
1 
-%define python3_sitearch /usr/lib/python3.5/site-packages
1 
+%define python3_sitearch /usr/lib/python3.6/site-packages
2 2 
 Summary:        C extensions for Python
3 3 
 Name:           cython3
4 4 
 Version:        0.25.2
5 
-Release:        1%{?dist}
5 
+Release:        2%{?dist}
6 6 
 Group:          Development/Libraries
7 7 
 License:        Apache License
8 8 
 URL:            http://cython.org/
... ... 
@@ -49,6 +49,8 @@ rm -rf %{buildroot}
49 49 
 %{python3_sitearch}/__pycache__/*
50 50
51 51 
 %changelog
52 
+*       Wed Apr 26 2017 Siju Maliakkal <smaliakkal@vmware.com> 0.25.2-2
53 
+-       Updated python3 site path
52 54 
 *       Mon Apr 24 2017 Bo Gan <ganb@vmware.com> 0.25.2-1
53 55 
 -       Update to 0.25.2
54 56 
 * 	Fri Jan 27 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.23.4-1
SPECS/libxml2/libxml2.spec
History View file @ f11b479
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        Libxml2
5 5 
 Name:           libxml2
6 6 
 Version:        2.9.4
7 
-Release:        6%{?dist}
7 
+Release:        7%{?dist}
8 8 
 License:        MIT
9 9 
 URL:            http://xmlsoft.org/
10 10 
 Group:          System Environment/General Libraries
... ... 
@@ -82,7 +82,7 @@ make clean
82 82 
     --bindir=%{_bindir} \
83 83 
     --libdir=%{_libdir} \
84 84 
     --disable-static \
85 
-    --with-python=/usr/bin/python3.5
85 
+    --with-python=/usr/bin/python3
86 86 
 make %{?_smp_mflags}
87 87 
 make install DESTDIR=%{buildroot}
88 88
... ... 
@@ -121,6 +121,8 @@ rm -rf %{buildroot}/*
121 121
122 122
123 123 
 %changelog
124 
+*   Wed Apr 26 2017 Siju Maliakkal <smaliakkal@vmware.com> 2.9.4-7
125 
+-   Modified python3 version in configure
124 126 
 *   Thu Apr 13 2017 Xiaolin Li <xiaolinl@vmware.com> 2.9.4-6
125 127 
 -   Added python3-libxml2 package.
126 128 
 *   Tue Jan 3 2017 Alexey Makhalov <amakhalov@vmware.com> 2.9.4-5
SPECS/protobuf/protobuf.spec
History View file @ f11b479
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Google's data interchange format
2 2 
 Name:           protobuf
3 3 
 Version:        3.2.0
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        BSD-3-Clause
6 6 
 Group:          Development/Libraries
7 7 
 Vendor:         VMware, Inc.
... ... 
@@ -135,12 +135,14 @@ popd
135 135 
 %{_libdir}/python2.7/site-packages/*
136 136
137 137 
 %files python3
138 
-%{_libdir}/python3.5/site-packages/*
138 
+%{_libdir}/python3.6/site-packages/*
139 139
140 140 
 %files java
141 141 
 %{_libdir}/java/protobuf/*.jar
142 142
143 143 
 %changelog
144 
+*   Fri Apr 28 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.2.0-3
145 
+-   Update python3 version
144 146 
 *   Thu Apr 13 2017 Vinay Kulkarni <kulkarniv@vmware.com> 3.2.0-2
145 147 
 -   Build protobuf-java.
146 148 
 *   Fri Mar 31 2017 Rongrong Qiu <rqiu@vmware.com> 3.2.0-1
SPECS/python-greenlet/python-greenlet.spec
History View file @ f11b479
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        Lightweight in-process concurrent programming
5 5 
 Name:           python-greenlet
6 6 
 Version:        0.4.12
7 
-Release:        1%{?dist}
7 
+Release:        2%{?dist}
8 8 
 License:        MIT
9 9 
 Group:          Development/Languages/Python
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -60,8 +60,10 @@ python3 setup.py test
60 60 
 %files -n python3-greenlet
61 61 
 %defattr(-,root,root,-)
62 62 
 %{python3_sitelib}/*
63 
-/usr/include/python3.5m/greenlet/greenlet.h
63 
+/usr/include/python3.6m/greenlet/greenlet.h
64 64
65 65 
 %changelog
66 
+*   Thu Apr 27 2017 Siju Maliakkal <smaliakkal@vmware.com> 0.4.12-2
67 
+-   updated python version
66 68 
 *   Thu Mar 02 2017 Xiaolin Li <xiaolinl@vmware.com> 0.4.12-1
67 69 
 -   Initial packaging for Photon
SPECS/python3/python3.spec
History View file @ f11b479
... ... 
@@ -1,14 +1,14 @@
1 1 
 Summary:        A high-level scripting language
2 2 
 Name:           python3
3 
-Version:        3.5.3
4 
-Release:        3%{?dist}
3 
+Version:        3.6.1
4 
+Release:        1%{?dist}
5 5 
 License:        PSF
6 6 
 URL:            http://www.python.org/
7 7 
 Group:          System Environment/Programming
8 8 
 Vendor:         VMware, Inc.
9 9 
 Distribution:   Photon
10 10 
 Source0:        https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
11 
-%define sha1    Python=127121fdca11e735b3686e300d66f73aba663e93
11 
+%define sha1    Python=91d880a2a9fcfc6753cbfa132bf47a47e17e7b16
12 12 
 Patch0:         cgi3.patch
13 13 
 Patch2:         python3-support-photon-platform.patch
14 14 
 BuildRequires:  pkg-config >= 0.28
... ... 
@@ -106,7 +106,7 @@ make %{?_smp_mflags}
106 106 
 %install
107 107 
 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*
108 108 
 make DESTDIR=%{buildroot} install
109 
-chmod -v 755 %{buildroot}%{_libdir}/libpython3.5m.so.1.0
109 
+chmod -v 755 %{buildroot}%{_libdir}/libpython3.6m.so.1.0
110 110 
 %{_fixperms} %{buildroot}/*
111 111
112 112 
 # Remove unused stuff
... ... 
@@ -120,15 +120,15 @@ make  %{?_smp_mflags} test
120 120
121 121 
 %post
122 122 
 /sbin/ldconfig
123 
-ln -sf %{_libdir}/libpython3.5m.so %{_libdir}/libpython3.5.so
123 
+ln -sf %{_libdir}/libpython3.6m.so %{_libdir}/libpython3.6.so
124 124
125 125 
 %post libs
126 126 
 export PYTHONHOME=/usr
127 
-export PYTHONPATH=/usr/lib/python3.5
127 
+export PYTHONPATH=/usr/lib/python3.6
128 128
129 129 
 %postun
130 130 
 if [ $1 -eq 0 ] ; then
131 
-    rm %{_libdir}/libpython3.5.so
131 
+    rm %{_libdir}/libpython3.6.so
132 132 
 fi
133 133 
 /sbin/ldconfig
134 134
... ... 
@@ -137,45 +137,45 @@ rm -rf %{buildroot}/*
137 137
138 138 
 %files
139 139 
 %defattr(-, root, root)
140 
-%doc LICENSE README
140 
+%doc LICENSE README.rst
141 141 
 %{_bindir}/pydoc*
142 142 
 %{_bindir}/pyvenv*
143 143 
 %{_bindir}/python*
144 144 
 %{_bindir}/pip*
145 145 
 %{_mandir}/*/*
146 146
147 
-%dir %{_libdir}/python3.5
148 
-%dir %{_libdir}/python3.5/site-packages
147 
+%dir %{_libdir}/python3.6
148 
+%dir %{_libdir}/python3.6/site-packages
149 149
150 150 
 %{_libdir}/libpython3.so
151 
-%{_libdir}/libpython3.5m.so
152 
-%{_libdir}/libpython3.5m.so.1.0
153 
-%{_libdir}/pkgconfig/python-3.5.pc
154 
-%{_libdir}/pkgconfig/python-3.5m.pc
151 
+%{_libdir}/libpython3.6m.so
152 
+%{_libdir}/libpython3.6m.so.1.0
153 
+%{_libdir}/pkgconfig/python-3.6.pc
154 
+%{_libdir}/pkgconfig/python-3.6m.pc
155 155 
 %{_libdir}/pkgconfig/python3.pc
156 156
157 
-%exclude %{_libdir}/python3.5/ctypes/test
158 
-%exclude %{_libdir}/python3.5/distutils/tests
159 
-%exclude %{_libdir}/python3.5/sqlite3/test
160 
-%exclude %{_libdir}/python3.5/idlelib/idle_test
161 
-%exclude %{_libdir}/python3.5/test
162 
-%exclude %{_libdir}/python3.5/lib-dynload/_ctypes_test.*.so
157 
+%exclude %{_libdir}/python3.6/ctypes/test
158 
+%exclude %{_libdir}/python3.6/distutils/tests
159 
+%exclude %{_libdir}/python3.6/sqlite3/test
160 
+%exclude %{_libdir}/python3.6/idlelib/idle_test
161 
+%exclude %{_libdir}/python3.6/test
162 
+%exclude %{_libdir}/python3.6/lib-dynload/_ctypes_test.*.so
163 163
164 164 
 %files libs
165 165 
 %defattr(-,root,root)
166 
-%doc LICENSE README
167 
-%{_libdir}/python3.5
168 
-%exclude %{_libdir}/python3.5/ctypes/test
169 
-%exclude %{_libdir}/python3.5/distutils/tests
170 
-%exclude %{_libdir}/python3.5/sqlite3/test
171 
-%exclude %{_libdir}/python3.5/idlelib/idle_test
172 
-%exclude %{_libdir}/python3.5/test
173 
-%exclude %{_libdir}/python3.5/lib-dynload/_ctypes_test.*.so
166 
+%doc LICENSE README.rst
167 
+%{_libdir}/python3.6
168 
+%exclude %{_libdir}/python3.6/ctypes/test
169 
+%exclude %{_libdir}/python3.6/distutils/tests
170 
+%exclude %{_libdir}/python3.6/sqlite3/test
171 
+%exclude %{_libdir}/python3.6/idlelib/idle_test
172 
+%exclude %{_libdir}/python3.6/test
173 
+%exclude %{_libdir}/python3.6/lib-dynload/_ctypes_test.*.so
174 174
175 175 
 %files devel
176 176 
 %defattr(-,root,root)
177 177 
 %{_includedir}/*
178 
-%{_bindir}/easy_install-3.5
178 
+%{_bindir}/easy_install-3.6
179 179
180 180 
 %doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
181 181 
 %{_libdir}/libpython3.so
... ... 
@@ -185,11 +185,13 @@ rm -rf %{buildroot}/*
185 185 
 %files tools
186 186 
 %defattr(-,root,root,755)
187 187 
 %doc Tools/README
188 
-%{_libdir}/python3.5/lib2to3
189 
-%{_bindir}/2to3-3.5
188 
+%{_libdir}/python3.6/lib2to3
189 
+%{_bindir}/2to3-3.6
190 190 
 %{_bindir}/idle*
191 191
192 192 
 %changelog
193 
+*   Wed Apr 26 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.6.1-1
194 
+-   Updating to latest
193 195 
 *   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 3.5.3-3
194 196 
 -   Python3-devel requires expat-devel.
195 197 
 *   Thu Mar 23 2017 Xiaolin Li <xiaolinl@vmware.com> 3.5.3-2