Browse code
Bug 1702273 & Bug 1865909 - Fix yum check & python 2&3
Change-Id: I4f3961c081c9e345b9808a6111f4ddd6865e50e8
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2668
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>
harishspqr authored on 2017/05/11 10:02:08Showing 3 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: The Apache Portable Runtime Utility Library |
| 2 | 2 |
Name: apr-util |
| 3 | 3 |
Version: 1.5.4 |
| 4 |
-Release: 9%{?dist}
|
|
| 4 |
+Release: 10%{?dist}
|
|
| 5 | 5 |
License: Apache License 2.0 |
| 6 | 6 |
URL: https://apr.apache.org/ |
| 7 | 7 |
Group: System Environment/Libraries |
| ... | ... |
@@ -19,6 +19,8 @@ BuildRequires: expat-devel |
| 19 | 19 |
Requires: apr |
| 20 | 20 |
Requires: openssl |
| 21 | 21 |
Requires: expat |
| 22 |
+Requires: nss |
|
| 23 |
+ |
|
| 22 | 24 |
%description |
| 23 | 25 |
The Apache Portable Runtime Utility Library. |
| 24 | 26 |
|
| ... | ... |
@@ -118,6 +120,8 @@ rm -rf $RPM_BUILD_ROOT |
| 118 | 118 |
%{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
|
| 119 | 119 |
|
| 120 | 120 |
%changelog |
| 121 |
+* Wed May 10 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.5.4-10 |
|
| 122 |
+- Add missing Requires. |
|
| 121 | 123 |
* Tue Apr 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.5.4-9 |
| 122 | 124 |
- Add expat-devel build deps otherwise it builds expat from its source tree |
| 123 | 125 |
* Fri Nov 18 2016 Alexey Makhalov <amakhalov@vmware.com> 1.5.4-8 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: A high-level scripting language |
| 2 | 2 |
Name: python2 |
| 3 | 3 |
Version: 2.7.13 |
| 4 |
-Release: 3%{?dist}
|
|
| 4 |
+Release: 4%{?dist}
|
|
| 5 | 5 |
License: PSF |
| 6 | 6 |
URL: http://www.python.org/ |
| 7 | 7 |
Group: System Environment/Programming |
| ... | ... |
@@ -215,11 +215,13 @@ rm -rf %{buildroot}/*
|
| 215 | 215 |
#%doc Tools/modulator/README.modulator |
| 216 | 216 |
#%{_libdir}/python2.7/lib2to3
|
| 217 | 217 |
#%{_libdir}/python2.7/site-packages/modulator
|
| 218 |
-%{_bindir}/smtpd*.py*
|
|
| 219 | 218 |
%{_bindir}/2to3*
|
| 220 |
-%{_bindir}/idle*
|
|
| 219 |
+%exclude %{_bindir}/smtpd.py
|
|
| 220 |
+%exclude %{_bindir}/idle*
|
|
| 221 | 221 |
|
| 222 | 222 |
%changelog |
| 223 |
+* Fri Apr 28 2017 Harish Udaiya <hudaiyakumar@vmware.com> 2.7.13-4 |
|
| 224 |
+- Excluded unwanted binaries from python2-tools. |
|
| 223 | 225 |
* Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.7.13-3 |
| 224 | 226 |
- Python2-devel requires expat-devel. |
| 225 | 227 |
* Fri Mar 24 2017 Xiaolin Li <xiaolinl@vmware.com> 2.7.13-2 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: A high-level scripting language |
| 2 | 2 |
Name: python3 |
| 3 | 3 |
Version: 3.6.1 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: PSF |
| 6 | 6 |
URL: http://www.python.org/ |
| 7 | 7 |
Group: System Environment/Programming |
| ... | ... |
@@ -187,9 +187,11 @@ rm -rf %{buildroot}/*
|
| 187 | 187 |
%doc Tools/README |
| 188 | 188 |
%{_libdir}/python3.6/lib2to3
|
| 189 | 189 |
%{_bindir}/2to3-3.6
|
| 190 |
-%{_bindir}/idle*
|
|
| 190 |
+%exclude %{_bindir}/idle*
|
|
| 191 | 191 |
|
| 192 | 192 |
%changelog |
| 193 |
+* Wed May 10 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.6.1-2 |
|
| 194 |
+- Exclude idle3. |
|
| 193 | 195 |
* Wed Apr 26 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.6.1-1 |
| 194 | 196 |
- Updating to latest |
| 195 | 197 |
* Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 3.5.3-3 |