Browse code

Pick fix for bug 1820176 from 1.0 to dev branch.

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

xiaolin-vmware authored on 2017/03/24 06:32:37
Showing 11 changed files
... ...
@@ -4,7 +4,7 @@
4 4
 Summary:        An asynchronous networking framework written in Python
5 5
 Name:           python-Twisted
6 6
 Version:        17.1.0
7
-Release:        1%{?dist}
7
+Release:        2%{?dist}
8 8
 License:        MIT
9 9
 Group:          Development/Languages/Python
10 10
 Vendor:         VMware, Inc.
... ...
@@ -18,6 +18,7 @@ BuildRequires:  python2-libs
18 18
 BuildRequires:  python2-devel
19 19
 BuildRequires:  python-setuptools
20 20
 BuildRequires:  python-incremental
21
+BuildRequires:  python-zope.interface
21 22
 
22 23
 Requires:       python2
23 24
 Requires:       python2-libs
... ...
@@ -35,22 +36,31 @@ Summary:        python-Twisted
35 35
 BuildRequires:  python3-devel
36 36
 BuildRequires:  python3-libs
37 37
 BuildRequires:  python3-incremental
38
+BuildRequires:  python3-zope.interface
38 39
 
39 40
 Requires:       python3
40 41
 Requires:       python3-libs
42
+Requires:       python3-zope.interface
43
+
41 44
 %description -n python3-Twisted
42 45
 Python 3 version.
43 46
 
44 47
 %prep
45 48
 %setup -q -n Twisted-%{version}
49
+rm -rf ../p3dir
50
+cp -a . ../p3dir
46 51
 
47 52
 %build
48 53
 python2 setup.py build
54
+pushd ../p3dir
49 55
 python3 setup.py build
56
+popd
50 57
 
51 58
 %install
52 59
 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
60
+pushd ../p3dir
53 61
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
62
+popd
54 63
 
55 64
 %check
56 65
 easy_install tox
... ...
@@ -66,6 +76,8 @@ tox -e py27-tests
66 66
 %{_bindir}/*
67 67
 
68 68
 %changelog
69
+*   Thu Mar 23 2017 Xiaolin Li <xiaolinl@vmware.com> 17.1.0-2
70
+-   Change requires
69 71
 *   Wed Mar 01 2017 Xiaolin Li <xiaolinl@vmware.com> 17.1.0-1
70 72
 -   Added python3 package and updated to version 17.1.0.
71 73
 *   Mon Oct 10 2016 ChangLee <changlee@vmware.com> 15.5.0-3
72 74
new file mode 100644
... ...
@@ -0,0 +1,75 @@
0
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1
+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
+
3
+Summary:        Attributes without boilerplate.
4
+Name:           python-attrs
5
+Version:        16.3.0
6
+Release:        1%{?dist}
7
+Url:            https://pypi.python.org/pypi/attrs
8
+License:        MIT
9
+Group:          Development/Languages/Python
10
+Vendor:         VMware, Inc.
11
+Distribution:   Photon
12
+Source0:        attrs-%{version}.tar.gz
13
+%define sha1    attrs=ce3d6456b024a21cc20291d605964dbcff205e64
14
+
15
+BuildArch:      noarch
16
+
17
+BuildRequires:  python2
18
+BuildRequires:  python2-libs
19
+BuildRequires:  python2-devel
20
+BuildRequires:  python-setuptools
21
+
22
+Requires:       python2
23
+Requires:       python2-libs
24
+
25
+%description
26
+Attributes without boilerplate.
27
+
28
+%package -n     python3-attrs
29
+Summary:        python-attrs
30
+BuildRequires:  python3
31
+BuildRequires:  python3-devel
32
+BuildRequires:  python3-libs
33
+
34
+Requires:       python3
35
+Requires:       python3-libs
36
+
37
+%description -n python3-attrs
38
+
39
+Python 3 version.
40
+
41
+%prep
42
+%setup -q -n attrs-%{version}
43
+rm -rf ../p3dir
44
+cp -a . ../p3dir
45
+
46
+%build
47
+python2 setup.py build
48
+pushd ../p3dir
49
+python3 setup.py build
50
+popd
51
+
52
+%install
53
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
54
+pushd ../p3dir
55
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
56
+popd
57
+
58
+%check
59
+python2 setup.py test
60
+pushd ../p3dir
61
+python3 setup.py test
62
+popd
63
+
64
+%files
65
+%defattr(-,root,root)
66
+%{python2_sitelib}/*
67
+
68
+%files -n python3-attrs
69
+%defattr(-,root,root,-)
70
+%{python3_sitelib}/*
71
+
72
+%changelog
73
+*   Mon Mar 13 2017 Xiaolin Li <xiaolinl@vmware.com> 16.3.0-1
74
+-   Initial packaging for Photon
... ...
@@ -1,17 +1,17 @@
1
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
 
4 4
 Summary:        Interface for Python to call C code
5 5
 Name:           python-cffi
6
-Version:        1.5.2
7
-Release:        4%{?dist}
6
+Version:        1.9.1
7
+Release:        1%{?dist}
8 8
 Url:            https://pypi.python.org/pypi/cffi
9 9
 License:        MIT
10 10
 Group:          Development/Languages/Python
11 11
 Vendor:         VMware, Inc.
12 12
 Distribution:   Photon
13 13
 Source0:        https://pypi.python.org/packages/source/c/cffi/cffi-%{version}.tar.gz
14
-%define sha1    cffi=5239b3aa4f67eed3559c09778096ecd4faeca876
14
+%define sha1    cffi=16265a4b305d433fb9089b19278502e904b0cb43
15 15
 
16 16
 BuildRequires:  python2
17 17
 BuildRequires:  python2-libs
... ...
@@ -41,28 +41,38 @@ Python 3 version.
41 41
 
42 42
 %prep
43 43
 %setup -q -n cffi-%{version}
44
+rm -rf ../p3dir
45
+cp -a . ../p3dir
44 46
 
45 47
 %build
46
-python setup.py build
48
+python2 setup.py build
49
+pushd ../p3dir
47 50
 python3 setup.py build
51
+popd
48 52
 
49 53
 %install
50
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
54
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
55
+pushd ../p3dir
51 56
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
57
+popd
52 58
 
53 59
 %check
54
-python setup.py test
60
+python2 setup.py test
61
+pushd ../p3dir
55 62
 python3 setup.py test
63
+popd
56 64
 
57 65
 %files
58 66
 %defattr(-,root,root)
59
-%{python_sitelib}/*
67
+%{python2_sitelib}/*
60 68
 
61 69
 %files -n python3-cffi
62 70
 %defattr(-,root,root,-)
63 71
 %{python3_sitelib}/*
64 72
 
65 73
 %changelog
74
+*   Thu Mar 23 2017 Xiaolin Li <xiaolinl@vmware.com> 1.9.1-1
75
+-   Updated to version 1.9.1.
66 76
 *   Thu Feb 02 2017 Xiaolin Li <xiaolinl@vmware.com> 1.5.2-4
67 77
 -   Added python3 site-packages.
68 78
 *   Mon Oct 03 2016 ChangLee <changLee@vmware.com> 1.5.2-3
69 79
new file mode 100644
... ...
@@ -0,0 +1,75 @@
0
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1
+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
+
3
+Summary:        Symbolic constants in Python.
4
+Name:           python-constantly
5
+Version:        15.1.0
6
+Release:        1%{?dist}
7
+Url:            https://pypi.python.org/pypi/constantly
8
+License:        MIT
9
+Group:          Development/Languages/Python
10
+Vendor:         VMware, Inc.
11
+Distribution:   Photon
12
+Source0:        constantly-%{version}.tar.gz
13
+%define sha1    constantly=02e60c17889d029e48a52a74259462e087a3dcdd
14
+
15
+BuildArch:      noarch
16
+
17
+BuildRequires:  python2
18
+BuildRequires:  python2-libs
19
+BuildRequires:  python2-devel
20
+BuildRequires:  python-setuptools
21
+
22
+Requires:       python2
23
+Requires:       python2-libs
24
+
25
+%description
26
+A library that provides symbolic constant support. It includes collections and constants with text, numeric, and bit flag values. Originally twisted.python.constants from the Twisted project.
27
+
28
+%package -n     python3-constantly
29
+Summary:        python-constantly
30
+BuildRequires:  python3
31
+BuildRequires:  python3-devel
32
+BuildRequires:  python3-libs
33
+
34
+Requires:       python3
35
+Requires:       python3-libs
36
+
37
+%description -n python3-constantly
38
+
39
+Python 3 version.
40
+
41
+%prep
42
+%setup -q -n constantly-%{version}
43
+rm -rf ../p3dir
44
+cp -a . ../p3dir
45
+
46
+%build
47
+python2 setup.py build
48
+pushd ../p3dir
49
+python3 setup.py build
50
+popd
51
+
52
+%install
53
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
54
+pushd ../p3dir
55
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
56
+popd
57
+
58
+%check
59
+python2 setup.py test
60
+pushd ../p3dir
61
+python3 setup.py test
62
+popd
63
+
64
+%files
65
+%defattr(-,root,root)
66
+%{python2_sitelib}/*
67
+
68
+%files -n python3-constantly
69
+%defattr(-,root,root,-)
70
+%{python3_sitelib}/*
71
+
72
+%changelog
73
+*   Mon Mar 13 2017 Xiaolin Li <xiaolinl@vmware.com> 15.1.0-1
74
+-   Initial packaging for Photon
0 75
new file mode 100644
... ...
@@ -0,0 +1,79 @@
0
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1
+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
+
3
+Summary:        Internationalized Domain Names in Applications (IDNA).
4
+Name:           python-idna
5
+Version:        2.5
6
+Release:        1%{?dist}
7
+Url:            https://pypi.python.org/pypi/idna
8
+License:        BSD-like
9
+Group:          Development/Languages/Python
10
+Vendor:         VMware, Inc.
11
+Distribution:   Photon
12
+Source0:        idna-%{version}.tar.gz
13
+%define sha1    idna=499531b72bf0440ded6ce7f079a1f979270ae2d0
14
+
15
+BuildArch:      noarch
16
+
17
+BuildRequires:  python2
18
+BuildRequires:  python2-libs
19
+BuildRequires:  python2-devel
20
+BuildRequires:  python-setuptools
21
+
22
+Requires:       python2
23
+Requires:       python2-libs
24
+
25
+%description
26
+Support for the Internationalised Domain Names in Applications (IDNA) protocol as specified in RFC 5891. This is the latest version of the protocol and is sometimes referred to as “IDNA 2008”.
27
+
28
+This library also provides support for Unicode Technical Standard 46, Unicode IDNA Compatibility Processing.
29
+
30
+This acts as a suitable replacement for the “encodings.idna” module that comes with the Python standard library, but only supports the old, deprecated IDNA specification (RFC 3490).
31
+
32
+%package -n     python3-idna
33
+Summary:        python-idna
34
+BuildRequires:  python3
35
+BuildRequires:  python3-devel
36
+BuildRequires:  python3-libs
37
+
38
+Requires:       python3
39
+Requires:       python3-libs
40
+
41
+%description -n python3-idna
42
+
43
+Python 3 version.
44
+
45
+%prep
46
+%setup -q -n idna-%{version}
47
+rm -rf ../p3dir
48
+cp -a . ../p3dir
49
+
50
+%build
51
+python2 setup.py build
52
+pushd ../p3dir
53
+python3 setup.py build
54
+popd
55
+
56
+%install
57
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
58
+pushd ../p3dir
59
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
60
+popd
61
+
62
+%check
63
+python2 setup.py test
64
+pushd ../p3dir
65
+python3 setup.py test
66
+popd
67
+
68
+%files
69
+%defattr(-,root,root)
70
+%{python2_sitelib}/*
71
+
72
+%files -n python3-idna
73
+%defattr(-,root,root,-)
74
+%{python3_sitelib}/*
75
+
76
+%changelog
77
+*   Mon Mar 13 2017 Xiaolin Li <xiaolinl@vmware.com> 2.5-1
78
+-   Initial packaging for Photon
0 79
new file mode 100644
... ...
@@ -0,0 +1,83 @@
0
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1
+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
+
3
+Summary:        A collection of ASN.1-based protocols modules.
4
+Name:           python-pyasn1-modules
5
+Version:        0.0.8
6
+Release:        1%{?dist}
7
+Url:            https://pypi.python.org/pypi/pyasn1-modules
8
+License:        BSD
9
+Group:          Development/Languages/Python
10
+Vendor:         VMware, Inc.
11
+Distribution:   Photon
12
+Source0:        pyasn1-modules-%{version}.tar.gz
13
+%define sha1    pyasn1-modules=0ee39382b5b97c8694a3373706edc1baea2e0e71
14
+
15
+BuildArch:      noarch
16
+
17
+BuildRequires:  python2
18
+BuildRequires:  python2-libs
19
+BuildRequires:  python2-devel
20
+BuildRequires:  python-setuptools
21
+
22
+Requires:       python2
23
+Requires:       python2-libs
24
+
25
+%description
26
+This is a small but growing collection of ASN.1 data structures expressed in Python terms using pyasn1 data model.
27
+
28
+It’s thought to be useful to protocol developers and testers.
29
+
30
+All modules are py2k/py3k-compliant.
31
+
32
+If you happen to convert some ASN.1 module into pyasn1 that is not yet present in this collection and wish to contribute - please send it to me.
33
+
34
+Written by Ilya Etingof <ilya@glas.net>.
35
+
36
+%package -n     python3-pyasn1-modules
37
+Summary:        python-pyasn1-modules
38
+BuildRequires:  python3
39
+BuildRequires:  python3-devel
40
+BuildRequires:  python3-libs
41
+
42
+Requires:       python3
43
+Requires:       python3-libs
44
+
45
+%description -n python3-pyasn1-modules
46
+
47
+Python 3 version.
48
+
49
+%prep
50
+%setup -q -n pyasn1-modules-%{version}
51
+rm -rf ../p3dir
52
+cp -a . ../p3dir
53
+
54
+%build
55
+python2 setup.py build
56
+pushd ../p3dir
57
+python3 setup.py build
58
+popd
59
+
60
+%install
61
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
62
+pushd ../p3dir
63
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
64
+popd
65
+
66
+%check
67
+python2 setup.py test
68
+pushd ../p3dir
69
+python3 setup.py test
70
+popd
71
+
72
+%files
73
+%defattr(-,root,root)
74
+%{python2_sitelib}/*
75
+
76
+%files -n python3-pyasn1-modules
77
+%defattr(-,root,root,-)
78
+%{python3_sitelib}/*
79
+
80
+%changelog
81
+*   Mon Mar 13 2017 Xiaolin Li <xiaolinl@vmware.com> 0.0.8-1
82
+-   Initial packaging for Photon
... ...
@@ -1,49 +1,82 @@
1
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3
+
1 4
 Name:           python-pyasn1
2
-Version:        0.1.9
5
+Version:        0.2.3
3 6
 Release:        3%{?dist}
4 7
 Summary:        Implementation of ASN.1 types and codecs in Python programming language
5 8
 License:        BSD
6 9
 Group:          Development/Languages/Python
7 10
 Url:            https://pypi.python.org/packages/source/p/pyasn1/pyasn1-%{version}.tar.gz
8
-Source0:        %{name}-%{version}.tar.gz
9
-%define sha1 python-pyasn1=d19599c5d9d039ead21ffcd1a2392c29a838ae03
11
+Source0:        pyasn1-%{version}.tar.gz
12
+%define sha1    pyasn1=e30253a024d1388a96be8e84245a0d38f47467ff
10 13
 
11
-BuildRequires: python2
12
-BuildRequires: python2-libs
13
-BuildRequires: python-setuptools
14
+BuildRequires:  python2
15
+BuildRequires:  python2-libs
16
+BuildRequires:  python-setuptools
14 17
 
15
-Requires: python2
16
-Requires: python2-libs
18
+Requires:       python2
19
+Requires:       python2-libs
17 20
 
18 21
 BuildArch:      noarch
19 22
 
20 23
 %description
21 24
 This is an implementation of ASN.1 types and codecs in Python programming language. It has been first written to support particular protocol (SNMP) but then generalized to be suitable for a wide range of protocols based on ASN.1 specification.
22 25
 
26
+%package -n     python3-pyasn1
27
+Summary:        python-pyasn1
28
+BuildRequires:  python3
29
+BuildRequires:  python3-devel
30
+BuildRequires:  python3-libs
31
+
32
+Requires:       python3
33
+Requires:       python3-libs
34
+
35
+%description -n python3-pyasn1
36
+
37
+Python 3 version.
38
+
23 39
 %prep
24 40
 %setup -n pyasn1-%{version}
41
+rm -rf ../p3dir
42
+cp -a . ../p3dir
25 43
 
26 44
 %build
27
-python setup.py build
45
+python2 setup.py build
46
+pushd ../p3dir
47
+python3 setup.py build
48
+popd
28 49
 
29 50
 %install
30
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
51
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
52
+pushd ../p3dir
53
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
54
+popd
31 55
 
32 56
 %check
33
-python setup.py test
57
+python2 setup.py test
58
+pushd ../p3dir
59
+python3 setup.py test
60
+popd
34 61
 
35 62
 %files
36 63
 %defattr(-,root,root,-)
37
-%{python_sitelib}/*
64
+%{python2_sitelib}/*
65
+
66
+%files -n python3-pyasn1
67
+%defattr(-,root,root,-)
68
+%{python3_sitelib}/*
38 69
 
39 70
 %changelog
40
-*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 0.1.9-3
41
--       Modified %check
42
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.1.9-2
43
--	GA - Bump release of all rpms
44
-* Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.1.9-1
45
-- Upgraded to version 0.1.9
46
-* Thu Aug 6 2015 Anish Swaminathan <anishs@vmware.com>
47
-- Added sha1sum
48
-* Fri Mar 13 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>
49
-- Initial packaging for Photon
71
+*   Thu Mar 23 2017 Xiaolin Li <xiaolinl@vmware.com> 0.2.3-1
72
+-   Updated to version 0.2.3.
73
+*   Mon Oct 04 2016 ChangLee <changlee@vmware.com> 0.1.9-3
74
+-   Modified %check
75
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.1.9-2
76
+-   GA - Bump release of all rpms
77
+*   Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.1.9-1
78
+-   Upgraded to version 0.1.9
79
+*   Thu Aug 6 2015 Anish Swaminathan <anishs@vmware.com>
80
+-   Added sha1sum
81
+*   Fri Mar 13 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>
82
+-   Initial packaging for Photon
... ...
@@ -1,16 +1,16 @@
1
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
 Summary:        Python C parser
4 4
 Name:           python-pycparser
5
-Version:        2.14
6
-Release:        4%{?dist}
5
+Version:        2.17
6
+Release:        1%{?dist}
7 7
 Url:            https://pypi.python.org/pypi/pycparser
8 8
 License:        BSD
9 9
 Group:          Development/Languages/Python
10 10
 Vendor:         VMware, Inc.
11 11
 Distribution:   Photon
12
-Source0:        https://pypi.python.org/packages/source/p/pycparser/pycparser-2.14.tar.gz
13
-%define sha1    pycparser=922162bad4aa8503988035506c1c65bbf8690ba4
12
+Source0:        https://pypi.python.org/packages/source/p/pycparser/pycparser-%{version}.tar.gz
13
+%define sha1    pycparser=afc1f70c6fce0e196dece88d6da3b8d5b2af6297
14 14
 
15 15
 BuildRequires:  python2
16 16
 BuildRequires:  python2-libs
... ...
@@ -39,7 +39,7 @@ Python 3 version.
39 39
 %setup -q -n pycparser-%{version}
40 40
 
41 41
 %build
42
-python setup.py build
42
+python2 setup.py build
43 43
 python3 setup.py build
44 44
 
45 45
 %install
... ...
@@ -52,13 +52,15 @@ python all_tests.py
52 52
 
53 53
 %files
54 54
 %defattr(-,root,root)
55
-%{python_sitelib}/*
55
+%{python2_sitelib}/*
56 56
 
57 57
 %files -n python3-pycparser
58 58
 %defattr(-,root,root,-)
59 59
 %{python3_sitelib}/*
60 60
 
61 61
 %changelog
62
+*   Thu Mar 23 2017 Xiaolin Li <xiaolinl@vmware.com> 2.17-1
63
+-   Updated to version 2.17.
62 64
 *   Thu Feb 02 2017 Xiaolin Li <xiaolinl@vmware.com> 2.14-4
63 65
 -   Added python3 site-packages.
64 66
 *   Mon Oct 04 2016 ChangLee <changlee@vmware.com> 2.14-3
65 67
new file mode 100644
... ...
@@ -0,0 +1,75 @@
0
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1
+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
+
3
+Summary:        Python parsing module.
4
+Name:           python-pyparsing
5
+Version:        2.1.10
6
+Release:        1%{?dist}
7
+Url:            https://pypi.python.org/pypi/pyparsing/2.1.10
8
+License:        MIT
9
+Group:          Development/Languages/Python
10
+Vendor:         VMware, Inc.
11
+Distribution:   Photon
12
+Source0:        pyparsing-%{version}.tar.gz
13
+%define sha1    pyparsing=3fc0a5109b6b178899927b773f77a32d504ee00f
14
+
15
+BuildArch:      noarch
16
+
17
+BuildRequires:  python2
18
+BuildRequires:  python2-libs
19
+BuildRequires:  python2-devel
20
+BuildRequires:  python-setuptools
21
+
22
+Requires:       python2
23
+Requires:       python2-libs
24
+
25
+%description
26
+Python parsing module.
27
+
28
+%package -n     python3-pyparsing
29
+Summary:        python-pyparsing
30
+BuildRequires:  python3
31
+BuildRequires:  python3-devel
32
+BuildRequires:  python3-libs
33
+
34
+Requires:       python3
35
+Requires:       python3-libs
36
+
37
+%description -n python3-pyparsing
38
+
39
+Python 3 version.
40
+
41
+%prep
42
+%setup -q -n pyparsing-%{version}
43
+rm -rf ../p3dir
44
+cp -a . ../p3dir
45
+
46
+%build
47
+python2 setup.py build
48
+pushd ../p3dir
49
+python3 setup.py build
50
+popd
51
+
52
+%install
53
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
54
+pushd ../p3dir
55
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
56
+popd
57
+
58
+%check
59
+python2 setup.py test
60
+pushd ../p3dir
61
+python3 setup.py test
62
+popd
63
+
64
+%files
65
+%defattr(-,root,root)
66
+%{python2_sitelib}/*
67
+
68
+%files -n python3-pyparsing
69
+%defattr(-,root,root,-)
70
+%{python3_sitelib}/*
71
+
72
+%changelog
73
+*   Mon Mar 13 2017 Xiaolin Li <xiaolinl@vmware.com> 2.1.10-1
74
+-   Initial packaging for Photon
... ...
@@ -3,15 +3,15 @@
3 3
 
4 4
 Summary:        Awesome Python HTTP Library That's Actually Usable
5 5
 Name:           python-requests
6
-Version:        2.9.1
7
-Release:        4%{?dist}
6
+Version:        2.13.0
7
+Release:        1%{?dist}
8 8
 License:        Apache2
9 9
 Group:          Development/Languages/Python
10 10
 Vendor:         VMware, Inc.
11 11
 Distribution:   Photon
12 12
 Url:            http://python-requests.org
13 13
 Source0:        http://pypi.python.org/packages/source/r/requests/requests-%{version}.tar.gz
14
-%define sha1 requests=17f01c47a0d7c676f6291608ef2f43db3fa74095
14
+%define sha1 requests=827f7c8abb5a57d980d9870908724613b8b120c1
15 15
 
16 16
 BuildRequires:  python2
17 17
 BuildRequires:  python2-libs
... ...
@@ -58,18 +58,26 @@ Python 3 version.
58 58
 
59 59
 %prep
60 60
 %setup -q -n requests-%{version}
61
+rm -rf ../p3dir
62
+cp -a . ../p3dir
61 63
 
62 64
 %build
63 65
 python2 setup.py build
66
+pushd ../p3dir
64 67
 python3 setup.py build
68
+popd
65 69
 
66 70
 %install
67 71
 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
72
+pushd ../p3dir
68 73
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
74
+popd
69 75
 
70 76
 %check
71 77
 python2 setup.py test
78
+pushd ../p3dir
72 79
 python3 setup.py test
80
+popd
73 81
 
74 82
 %files
75 83
 %defattr(-,root,root)
... ...
@@ -82,6 +90,8 @@ python3 setup.py test
82 82
 %{python3_sitelib}/*
83 83
 
84 84
 %changelog
85
+*   Thu Mar 23 2017 Xiaolin Li <xiaolinl@vmware.com> 2.13.0-1
86
+-   Updated to version 2.13.0.
85 87
 *   Wed Mar 01 2017 Xiaolin Li <xiaolinl@vmware.com> 2.9.1-4
86 88
 -   Added python3 package.
87 89
 *   Mon Oct 04 2016 ChangLee <changlee@vmware.com> 2.9.1-3
... ...
@@ -1,19 +1,22 @@
1
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3
+
1 4
 Name:           python-zope.interface
2
-Version:        4.1.3
3
-Release:        3%{?dist}
5
+Version:        4.3.3
6
+Release:        1%{?dist}
4 7
 Url:            https://github.com/zopefoundation/zope.interface
5 8
 Summary:        Interfaces for Python
6 9
 License:        ZPL 2.1
7 10
 Group:          Development/Languages/Python
8 11
 Source0:        https://pypi.python.org/packages/source/z/zope.interface/zope.interface-%{version}.tar.gz
9
-%define sha1 zope.interface=207161e27880d07679aff6d712ed12f55e3d91b6
12
+%define sha1    zope.interface=66bd8e4af0f16468914fefc90ba9cca23e66cd9d
10 13
 
11
-BuildRequires: python2-devel
12
-BuildRequires: python2-libs
13
-BuildRequires: python-setuptools
14
+BuildRequires:  python2-devel
15
+BuildRequires:  python2-libs
16
+BuildRequires:  python-setuptools
14 17
 
15 18
 Requires:       python2
16
-Requires:		python2-libs
19
+Requires:       python2-libs
17 20
 
18 21
 %description
19 22
 This package is intended to be independently reusable in any Python project. It is maintained by the Zope Toolkit project.
... ...
@@ -22,26 +25,54 @@ This package provides an implementation of “object interfaces” for Python. I
22 22
 
23 23
 For detailed documentation, please see http://docs.zope.org/zope.interface
24 24
 
25
+%package -n     python3-zope.interface
26
+Summary:        python-zope.interface
27
+BuildRequires:  python3
28
+BuildRequires:  python3-devel
29
+BuildRequires:  python3-libs
30
+
31
+Requires:       python3
32
+Requires:       python3-libs
33
+
34
+%description -n python3-zope.interface
35
+
36
+Python 3 version.
25 37
 %prep
26 38
 %setup -q -n zope.interface-%{version}
39
+rm -rf ../p3dir
40
+cp -a . ../p3dir
27 41
 
28 42
 %build
29
-python setup.py build
43
+python2 setup.py build
44
+pushd ../p3dir
45
+python3 setup.py build
46
+popd
30 47
 
31 48
 %install
32
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
49
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
50
+pushd ../p3dir
51
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
52
+popd
53
+
33 54
 
34 55
 %check
35
-python setup.py test
56
+python2 setup.py test
57
+pushd ../p3dir
58
+python3 setup.py test
59
+popd
36 60
 
37 61
 %files
38 62
 %defattr(-,root,root)
39
-%{python_sitelib}/*
63
+%{python2_sitelib}/*
64
+
65
+%files -n python3-zope.interface
66
+%defattr(-,root,root,-)
67
+%{python3_sitelib}/*
40 68
 
41 69
 %changelog
42 70
 *       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 4.1.3-3
43 71
 -       Modified %check
44
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.1.3-2
45
--	GA - Bump release of all rpms
72
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.1.3-2
73
+-   GA - Bump release of all rpms
46 74
 * Tue Oct 27 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>
47 75
 - Initial packaging for Photon