Merge remote-tracking branch 'origin/master' into 1

Conflicts:
	libuv.spec

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher 2020-07-31 11:55:06 -04:00
commit ef0f564516
No known key found for this signature in database
GPG Key ID: 45DB85A568286D11

View File

@ -6,7 +6,7 @@
Name: libuv
Epoch: 1
Version: 1.38.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Platform layer for node.js
# the licensing breakdown is described in detail in the LICENSE file
@ -80,6 +80,9 @@ install -Dm0644 -t %{buildroot}%{_libdir}/libuv/ %{SOURCE3}
%{_libdir}/%{name}.a
%changelog
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.38.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon May 18 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.38.0-2
- Fix up gating tests