Browse code
update python2 and python3 deps, fix apr-util published files.
Change-Id: Ie970c82f9d08aab2d8664176db29e9adad0ea7ee
Reviewed-on: http://photon-jenkins.eng.vmware.com/715
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>
ppadmavilasom authored on 2016/04/14 06:49:12Showing 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: 5%{?dist}
|
|
| 4 |
+Release: 6%{?dist}
|
|
| 5 | 5 |
License: Apache License 2.0 |
| 6 | 6 |
URL: https://apr.apache.org/ |
| 7 | 7 |
Group: System Environment/Libraries |
| ... | ... |
@@ -75,7 +75,6 @@ make %{?_smp_mflags}
|
| 75 | 75 |
|
| 76 | 76 |
%install |
| 77 | 77 |
make DESTDIR=%{buildroot} install
|
| 78 |
-rm %{buildroot}/usr/lib/libexpat.so
|
|
| 79 | 78 |
%clean |
| 80 | 79 |
rm -rf $RPM_BUILD_ROOT |
| 81 | 80 |
|
| ... | ... |
@@ -86,7 +85,6 @@ rm -rf $RPM_BUILD_ROOT |
| 86 | 86 |
%files |
| 87 | 87 |
%defattr(-,root,root) |
| 88 | 88 |
%{_libdir}/aprutil.exp
|
| 89 |
-%{_libdir}/libexpat.so.*
|
|
| 90 | 89 |
%{_libdir}/libaprutil-%{apuver}.so.*
|
| 91 | 90 |
%{_libdir}/apr-util-%{apuver}/apr_crypto_nss*
|
| 92 | 91 |
%{_libdir}/apr-util-%{apuver}/apr_crypto_openssl*
|
| ... | ... |
@@ -96,7 +94,6 @@ rm -rf $RPM_BUILD_ROOT |
| 96 | 96 |
%defattr(-,root,root) |
| 97 | 97 |
%{_libdir}/libaprutil-%{apuver}.*a
|
| 98 | 98 |
%{_libdir}/libaprutil-%{apuver}.so
|
| 99 |
-%{_libdir}/libexpat.*a
|
|
| 100 | 99 |
%{_bindir}/*
|
| 101 | 100 |
%{_includedir}/*
|
| 102 | 101 |
%{_libdir}/pkgconfig/apr-util-%{apuver}.pc
|
| ... | ... |
@@ -114,6 +111,8 @@ rm -rf $RPM_BUILD_ROOT |
| 114 | 114 |
%{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
|
| 115 | 115 |
|
| 116 | 116 |
%changelog |
| 117 |
+* Wed Apr 13 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5.4-6 |
|
| 118 |
+- remove libexpat files |
|
| 117 | 119 |
* Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.5.4-5 |
| 118 | 120 |
- Updated build-requires after creating devel package for apr. |
| 119 | 121 |
* Wed Sep 16 2015 Xiaolin Li <xiaolinl@vmware.com> 1.5.4-4 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: A high-level scripting language |
| 2 | 2 |
Name: python2 |
| 3 | 3 |
Version: 2.7.11 |
| 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 |
| ... | ... |
@@ -19,6 +19,7 @@ BuildRequires: sqlite-autoconf |
| 19 | 19 |
BuildRequires: ncurses-devel |
| 20 | 20 |
Requires: bzip2 |
| 21 | 21 |
Requires: openssl |
| 22 |
+Requires: python2-libs = %{version}-%{release}
|
|
| 22 | 23 |
Provides: python-sqlite |
| 23 | 24 |
Provides: python(abi) |
| 24 | 25 |
Provides: /bin/python |
| ... | ... |
@@ -32,7 +33,6 @@ version is for backward compatibility with other dependent packages. |
| 32 | 32 |
%package libs |
| 33 | 33 |
Summary: The libraries for python runtime |
| 34 | 34 |
Group: Applications/System |
| 35 |
-Requires: python2 = %{version}-%{release}
|
|
| 36 | 35 |
Requires: sqlite-autoconf |
| 37 | 36 |
Requires: expat >= 2.1.0 |
| 38 | 37 |
Requires: libffi >= 3.0.13 |
| ... | ... |
@@ -212,6 +212,9 @@ rm -rf %{buildroot}/*
|
| 212 | 212 |
%{_bindir}/idle*
|
| 213 | 213 |
|
| 214 | 214 |
%changelog |
| 215 |
+* Wed Apr 13 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.11-2 |
|
| 216 |
+- update python to require python-libs |
|
| 217 |
+ |
|
| 215 | 218 |
* Thu Jan 28 2016 Anish Swaminathan <anishs@vmware.com> 2.7.11-1 |
| 216 | 219 |
- Upgrade version |
| 217 | 220 |
|
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: A high-level scripting language |
| 2 | 2 |
Name: python3 |
| 3 | 3 |
Version: 3.5.1 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: PSF |
| 6 | 6 |
URL: http://www.python.org/ |
| 7 | 7 |
Group: System Environment/Programming |
| ... | ... |
@@ -19,6 +19,7 @@ BuildRequires: xz-devel |
| 19 | 19 |
Requires: bzip2 |
| 20 | 20 |
Requires: ncurses |
| 21 | 21 |
Requires: openssl |
| 22 |
+Requires: python3-libs = %{version}-%{release}
|
|
| 22 | 23 |
Requires: readline |
| 23 | 24 |
Requires: xz |
| 24 | 25 |
Provides: python-sqlite |
| ... | ... |
@@ -35,7 +36,6 @@ code. It is incompatible with Python 2.x releases. |
| 35 | 35 |
%package libs |
| 36 | 36 |
Summary: The libraries for python runtime |
| 37 | 37 |
Group: Applications/System |
| 38 |
-Requires: python3 = %{version}-%{release}
|
|
| 39 | 38 |
BuildRequires: expat >= 2.1.0 |
| 40 | 39 |
BuildRequires: libffi >= 3.0.13 |
| 41 | 40 |
BuildRequires: ncurses-devel |
| ... | ... |
@@ -118,7 +118,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 118 | 118 |
/sbin/ldconfig |
| 119 | 119 |
#ln -s %{_bindir}/python3 %{_bindir}/python
|
| 120 | 120 |
#ln -s %{_bindir}/python3-config %{_bindir}/python-config
|
| 121 |
-ln -s %{_libdir}/libpython3.5m.so %{_libdir}/libpython3.5.so
|
|
| 121 |
+ln -sf %{_libdir}/libpython3.5m.so %{_libdir}/libpython3.5.so
|
|
| 122 | 122 |
|
| 123 | 123 |
%post libs |
| 124 | 124 |
export PYTHONHOME=/usr |
| ... | ... |
@@ -186,6 +186,8 @@ rm -rf %{buildroot}/*
|
| 186 | 186 |
%{_bindir}/idle*
|
| 187 | 187 |
|
| 188 | 188 |
%changelog |
| 189 |
+* Wed Apr 13 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.5.1-3 |
|
| 190 |
+- update python to require python-libs |
|
| 189 | 191 |
* Thu Apr 07 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 3.5.1-2 |
| 190 | 192 |
- Providing python3 binaries instead of the minor versions. |
| 191 | 193 |
* Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.5.1-1 |