Browse code

fix test failures for mkinitcpio, paramiko, nspr. dep build failure for tdnf

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

Priyesh Padmavilasom authored on 2017/05/06 09:15:09
Showing 7 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,8 @@
0
+--- systemd/mkinitcpio-generate-shutdown-ramfs.service  2017-05-05 17:37:54.445255220 +0000
1
+@@ -9,4 +9,5 @@
2
+ # /tmp could be umounted at this point
3
+ # use /run as temporary directory
4
+ Environment=TMPDIR=/run
5
++ExecStartPre=/usr/bin/mkdir -p /run/initramfs
6
+ ExecStart=/usr/bin/mkinitcpio -A sd-shutdown -k none -c /dev/null -d /run/initramfs
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:    Modular initramfs image creation utility
2 2
 Name:       mkinitcpio
3 3
 Version:    23
4
-Release:    2%{?dist}
4
+Release:    3%{?dist}
5 5
 License:    GPLv2
6 6
 URL:        https://projects.archlinux.org/mkinitcpio.git/
7 7
 Group:      System Environment/Development
... ...
@@ -9,6 +9,7 @@ Vendor:     VMware, Inc.
9 9
 Distribution:   Photon
10 10
 Source0:    https://projects.archlinux.org/mkinitcpio.git/snapshot/%{name}-%{version}.tar.gz
11 11
 %define sha1 mkinitcpio=4459418eb423b2699e798c4523a59cc07a567a98
12
+Patch0:     mkinitcpio-shutdown-ramfs.service.patch
12 13
 BuildRequires: asciidoc
13 14
 BuildRequires: python2-libs
14 15
 BuildRequires: python-xml
... ...
@@ -22,6 +23,7 @@ Multi-format archive and compression library
22 22
 
23 23
 %prep
24 24
 %setup -q
25
+%patch0 -p0
25 26
 
26 27
 %build
27 28
 
... ...
@@ -47,6 +49,8 @@ make DESTDIR=%{buildroot} install
47 47
 /usr/share/*
48 48
 
49 49
 %changelog
50
+*   Fri May 05 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 23-3
51
+-   fix directory create in shutdown service
50 52
 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 23-2
51 53
 -   Fix arch
52 54
 *   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 23-1
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Platform-neutral API
2 2
 Name:		nspr
3 3
 Version:	4.14
4
-Release:	1%{?dist}
4
+Release:	2%{?dist}
5 5
 License:	MPLv2.0
6 6
 URL:		http://ftp.mozilla.org/pub/mozilla.org
7 7
 Group:		Applications/System
... ...
@@ -48,16 +48,18 @@ make DESTDIR=%{buildroot} install
48 48
 
49 49
 %files
50 50
 %defattr(-,root,root)
51
+%{_bindir}/*
51 52
 %{_libdir}/*.so
52 53
 
53 54
 %files devel
54 55
 %defattr(-,root,root)
55
-%{_bindir}/*
56 56
 %{_includedir}/*
57 57
 %{_libdir}/pkgconfig/*.pc
58 58
 %{_datarootdir}/aclocal/*
59 59
 
60 60
 %changelog
61
+*   Fri May 05 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.14-2
62
+-   Fix error - binary packed in devel.
61 63
 *   Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.14-1
62 64
 -   Update to 4.14
63 65
 *   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 4.12-3
... ...
@@ -3,7 +3,7 @@
3 3
 Summary:        Python SSH module
4 4
 Name:           paramiko
5 5
 Version:        2.1.2
6
-Release:        1%{?dist}
6
+Release:        2%{?dist}
7 7
 License:        LGPL
8 8
 Group:          System Environment/Security
9 9
 Vendor:         VMware, Inc.
... ...
@@ -18,10 +18,12 @@ BuildRequires:  python-setuptools
18 18
 BuildRequires:  python2-devel
19 19
 BuildRequires:  ecdsa > 0.11
20 20
 BuildRequires:  pycrypto > 2.1
21
+BuildRequires:  python-cryptography
21 22
 
22 23
 Requires:       python2
23 24
 Requires:       pycrypto > 2.1
24 25
 Requires:       ecdsa > 0.11
26
+Requires:       python-cryptography
25 27
 
26 28
 
27 29
 %description
... ...
@@ -32,10 +34,12 @@ Summary:        python3-paramiko
32 32
 BuildRequires:  python3-devel
33 33
 BuildRequires:  python3-ecdsa > 0.11
34 34
 BuildRequires:  python3-pycrypto > 2.1
35
+BuildRequires:  python3-cryptography
35 36
 
36 37
 Requires:       python3
37 38
 Requires:       python3-pycrypto > 2.1
38 39
 Requires:       python3-ecdsa > 0.11
40
+Requires:       python3-cryptography
39 41
 %description -n python3-paramiko
40 42
 
41 43
 Python 3 version.
... ...
@@ -75,6 +79,8 @@ python3   test.py
75 75
 %{python3_sitelib}/*
76 76
 
77 77
 %changelog
78
+*   Fri May 05 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.2-2
79
+-   Added missing requires python-cryptography
78 80
 *   Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.2-1
79 81
 -   Update to 2.1.2
80 82
 *   Mon Feb 27 2017 Xiaolin Li <xiaolinl@vmware.com> 1.16.0-4
81 83
new file mode 100644
... ...
@@ -0,0 +1,70 @@
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
+Name:           python-asn1crypto
4
+Version:        0.22.0
5
+Release:        1%{?dist}
6
+Summary:        A fast, pure Python library for parsing and serializing ASN.1 structures.
7
+License:        MIT
8
+Group:          Development/Languages/Python
9
+Url:            https://pypi.python.org/packages/67/14/5d66588868c4304f804ebaff9397255f6ec5559e46724c2496e0f26e68d6/asn1crypto-0.22.0.tar.gz
10
+Source0:        asn1crypto-%{version}.tar.gz
11
+%define sha1    asn1crypto=c4f60b52dd06e3fd0ed568a741e968aaccd2e3e5
12
+
13
+BuildRequires:  python2
14
+BuildRequires:  python2-libs
15
+BuildRequires:  python-setuptools
16
+BuildRequires:  python3
17
+BuildRequires:  python3-devel
18
+BuildRequires:  python3-libs
19
+
20
+Requires:       python2
21
+Requires:       python2-libs
22
+
23
+BuildArch:      noarch
24
+
25
+%description
26
+A fast, pure Python library for parsing and serializing ASN.1 structures.
27
+
28
+%package -n     python3-asn1crypto
29
+Summary:        A fast, pure Python library for parsing and serializing ASN.1 structures.
30
+Requires:       python3
31
+Requires:       python3-libs
32
+
33
+%description -n python3-asn1crypto
34
+Python 3 version of asn1crypto
35
+
36
+%prep
37
+%setup -qn asn1crypto-%{version}
38
+rm -rf ../p3dir
39
+cp -a . ../p3dir
40
+
41
+%build
42
+python2 setup.py build
43
+pushd ../p3dir
44
+python3 setup.py build
45
+popd
46
+
47
+%install
48
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
49
+pushd ../p3dir
50
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
51
+popd
52
+
53
+%check
54
+python2 setup.py test
55
+pushd ../p3dir
56
+python3 setup.py test
57
+popd
58
+
59
+%files
60
+%defattr(-,root,root,-)
61
+%{python2_sitelib}/*
62
+
63
+%files -n python3-asn1crypto
64
+%defattr(-,root,root,-)
65
+%{python3_sitelib}/*
66
+
67
+%changelog
68
+*   Fri May 05 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.22.0-1
69
+-   Initial
... ...
@@ -4,7 +4,7 @@
4 4
 Summary:        Python cryptography library
5 5
 Name:           python-cryptography
6 6
 Version:        1.8.1
7
-Release:        1%{?dist}
7
+Release:        2%{?dist}
8 8
 Url:            https://pypi.python.org/pypi/cryptography
9 9
 License:        ASL 2.0
10 10
 Group:          Development/Languages/Python
... ...
@@ -28,6 +28,8 @@ Requires:       python-pyasn1
28 28
 Requires:       python-ipaddress
29 29
 Requires:       python-setuptools
30 30
 Requires:       python-packaging
31
+Requires:       python-enum
32
+Requires:       python-asn1crypto
31 33
 
32 34
 %description
33 35
 Cryptography is a Python library which exposes cryptographic recipes and primitives.
... ...
@@ -46,6 +48,7 @@ Requires:       python3-idna
46 46
 Requires:       python3-pyasn1
47 47
 Requires:       python3-six
48 48
 Requires:       python3-packaging
49
+Requires:       python3-asn1crypto
49 50
 
50 51
 %description -n python3-cryptography
51 52
 
... ...
@@ -92,6 +95,8 @@ python3 setup.py test
92 92
 %{python3_sitelib}/*
93 93
 
94 94
 %changelog
95
+*   Fri May 05 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.1-2
96
+-   Added missing requires python-enum
95 97
 *   Tue Apr 04 2017 Xiaolin Li <xiaolinl@vmware.com> 1.8.1-1
96 98
 -   Updated to version 1.8.1.
97 99
 *   Thu Feb 02 2017 Xiaolin Li <xiaolinl@vmware.com> 1.7.2-1
... ...
@@ -4,7 +4,7 @@
4 4
 Summary:        dnf/yum equivalent using C libs
5 5
 Name:           tdnf
6 6
 Version:        1.2.0
7
-Release:        1%{?dist}
7
+Release:        2%{?dist}
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10 10
 License:        LGPLv2.1,GPLv2
... ...
@@ -35,6 +35,7 @@ which uses libhawkey and librepo
35 35
 Summary:    A Library providing C API for tdnf
36 36
 Group:      Development/Libraries
37 37
 Requires:   tdnf = %{version}-%{release}
38
+Requires:   hawkey-devel >= 2017.1
38 39
 
39 40
 %description devel
40 41
 Development files for tdnf
... ...
@@ -147,6 +148,8 @@ systemctl try-restart tdnf-cache-updateinfo.timer >/dev/null 2>&1 || :
147 147
     %{_libdir}/libtdnfcli.so.*
148 148
 
149 149
 %changelog
150
+*   Fri May 05 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.0-2
151
+-   Fix Requires for cli-libs
150 152
 *   Wed May 03 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.0-1
151 153
 -   update to v1.2.0
152 154
 *   Sun Apr 30 2017 Bo Gan <ganb@vmware.com> 1.1.0-5