1. photon
  2. Commit ab1fe4fb11e614e6a74a9efc426443d099d5d319
Browse code

Upgrade python, enable multithreaded perl

Change-Id: Ibf2c8c3137c5ff8ddb45511113d23899973c9c76
Reviewed-on: http://photon-jenkins.eng.vmware.com/486
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>

suezzelur authored on 2016/02/01 19:41:21
Showing 4 changed files
SPECS/XML-Parser/XML-Parser.spec
History View file @ ab1fe4f
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	XML-Parser perl module
2 2 
 Name:		XML-Parser
3 3 
 Version:	2.41
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GPL+
6 6 
 URL:		http://search.cpan.org/~toddr/%{name}-%{version}/
7 7 
 Source0:		http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/%{name}-%{version}.tar.gz
... ... 
@@ -20,10 +20,10 @@ perl Makefile.PL --prefix=%{_prefix}
20 20 
 make %{?_smp_mflags}
21 21 
 %install
22 22 
 make DESTDIR=%{buildroot} install
23 
-if [ -e %{_libdir}/perl5/5.22.1/x86_64-linux/perllocal.pod ]; then
24 
-cat %{buildroot}/%{_libdir}/perl5/5.22.1/x86_64-linux/perllocal.pod >> %{_libdir}/perl5/5.22.1/x86_64-linux/perllocal.pod
23 
+if [ -e %{_libdir}/perl5/5.22.1/x86_64-linux-thread-multi/perllocal.pod ]; then
24 
+cat %{buildroot}/%{_libdir}/perl5/5.22.1/x86_64-linux-thread-multi/perllocal.pod >> %{_libdir}/perl5/5.22.1/x86_64-linux-thread-multi/perllocal.pod
25 25 
 fi
26 
-rm %{buildroot}/%{_libdir}/perl5/5.22.1/x86_64-linux/perllocal.pod
26 
+rm %{buildroot}/%{_libdir}/perl5/5.22.1/x86_64-linux-thread-multi/perllocal.pod
27 27 
 %check
28 28 
 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
29 29 
 %files
... ... 
@@ -31,6 +31,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
31 31 
 %{_libdir}/perl5/*
32 32 
 %{_mandir}/man3/*
33 33 
 %changelog
34 
+*	Mon Feb 01 2016 Anish Swaminathan <anishs@vmware.com> 2.41-3
35 
+-	Fix for multithreaded perl
34 36 
 *	Wed Jan 13 2016 Anish Swaminathan <anishs@vmware.com> 2.41-2
35 37 
 -	Fix for new perl
36 38 
 *	Thu Oct 23 2014 Divya Thaluru <dthaluru@vmware.com> 2.41-1
SPECS/perl-YAML/perl-YAML.spec
History View file @ ab1fe4f
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:        YAML Ain't Markup Language (tm)
3 3 
 Name:           perl-YAML
4 4 
 Version:        1.14
5 
-Release:        1%{?dist}
5 
+Release:        2%{?dist}
6 6 
 License:        GPL+ or Artistic
7 7 
 Group:          Development/Libraries
8 8 
 URL:            http://search.cpan.org/dist/YAML/
... ... 
@@ -31,12 +31,11 @@ specification.
31 31 
 %setup -q -n YAML-%{version}
32 32
33 33 
 %build
34 
-perl Makefile.PL INSTALLDIRS=vendor
34 
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
35 35 
 make %{?_smp_mflags}
36 36
37 37 
 %install
38 38 
 make install DESTDIR=%{buildroot}
39 
-rm %{buildroot}%{perl_vendorlib}/x86_64-linux/auto/YAML/.packlist
40 39 
 find %{buildroot} -name 'perllocal.pod' -delete
41 40
42 41 
 %check
... ... 
@@ -82,6 +81,8 @@ make test
82 82 
 %{_mandir}/man3/YAML::Types.3*
83 83
84 84 
 %changelog
85 
+*	Mon Feb 01 2016 Anish Swaminathan <anishs@vmware.com> 1.14-2
86 
+-	Fix for multithreaded perl
85 87 
 *	Fri Apr 3 2015 Divya Thaluru <dthaluru@vmware.com> 1.14-1
86 88 
 -	Initial version.
87 89
SPECS/perl/perl.spec
History View file @ ab1fe4f
... ... 
@@ -9,7 +9,7 @@
9 9 
 Summary:	Practical Extraction and Report Language
10 10 
 Name:		perl
11 11 
 Version:	5.22.1
12 
-Release:	1%{?dist}
12 
+Release:	2%{?dist}
13 13 
 License:	GPLv1+
14 14 
 URL:		http://www.perl.org/
15 15 
 Group:		Development/Languages
... ... 
@@ -45,6 +45,7 @@ sh Configure -des \
45 45 
 	-Dman3dir=%{_mandir}/man3 \
46 46 
 	-Dpager=%{_bindir}"/less -isR" \
47 47 
 	-Duseshrplib \
48 
+	-Dusethreads \
48 49 
         -DPERL_RANDOM_DEVICE="/dev/erandom"
49 50
50 51 
 make VERBOSE=1 %{?_smp_mflags}
... ... 
@@ -61,6 +62,8 @@ unset BUILD_ZLIB BUILD_BZIP2
61 61 
 %{_libdir}/perl5/%{version}/*
62 62 
 %{_mandir}/*/*
63 63 
 %changelog
64 
+*	Thu Jan 26 2016 Anish Swaminathan <anishs@vmware.com> 5.22.1-2
65 
+-	Enable threads
64 66 
 *	Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com> 5.22.1-1
65 67 
 -	Update version
66 68 
 *	Thu Jun 4 2015 Touseef Liaqat <tliaqat@vmware.com> 5.18.2-2
SPECS/python2/python2.spec
History View file @ ab1fe4f
... ... 
@@ -1,14 +1,14 @@
1 1 
 Summary:	A high-level scripting language
2 2 
 Name:		python2
3 
-Version:	2.7.9
4 
-Release:	5%{?dist}
3 
+Version:	2.7.11
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 
-Source0:	http://www.python.org/ftp/python/2.7.9/Python-%{version}.tar.xz
11 
-%define sha1 Python=3172f6e957713c2d9fca462cc16068222fd1b9d3
10 
+Source0:	http://www.python.org/ftp/python/2.7.11/Python-%{version}.tar.xz
11 
+%define sha1 Python=c3b8bbe3f084c4d4ea13ffb03d75a5e22f9756ff
12 12 
 Patch: cgi.patch
13 13 
 BuildRequires:	pkg-config >= 0.28
14 14 
 BuildRequires:	bzip2-devel
... ... 
@@ -212,6 +212,9 @@ rm -rf %{buildroot}/*
212 212 
 %{_bindir}/idle*
213 213
214 214 
 %changelog
215 
+*   	Thu Jan 28 2016 Anish Swaminathan <anishs@vmware.com> 2.7.11-1
216 
+-   	Upgrade version
217 
+
215 218 
 *	Fri Jan 22 2016 Divya Thaluru <dthaluru@vmware.com> 2.7.9-5
216 219 
 -	Seperate python-curses package from python-libs package
217 220