fix merge

This commit is contained in:
Tom Callaway 2017-04-22 12:38:49 -07:00
commit 99b8085eea
3 changed files with 9 additions and 6 deletions

3
.gitignore vendored
View File

@ -1,2 +1 @@
/libcxxabi-3.9.0.src.tar.xz
/libcxxabi-3.8.1.src.tar.xz
/libcxxabi-3.9.1.src.tar.xz

View File

@ -1,6 +1,6 @@
Name: libcxxabi
Version: 3.8.1
Release: 2%{?dist}
Version: 3.9.1
Release: 1%{?dist}
Summary: Low level support for a standard C++ library
License: MIT or NCSA
URL: http://libcxxabi.llvm.org/
@ -90,7 +90,11 @@ cp -a include/* %{buildroot}%{_includedir}
%{_libdir}/libc++abi.a
%changelog
* Wed Mar 1 2017 Tom Callaway <spot@fedoraproject.org> - 3.8.1-2
* Sat Apr 22 2017 Tom Callaway <spot@fedoraproject.org> - 3.9.1-1
- update to 3.9.1
* Mon Feb 20 2017 Tom Callaway <spot@fedoraproject.org> - 3.9.0-1
- update to 3.9.0
- apply fixes from libcxx
* Wed Sep 7 2016 Tom Callaway <spot@fedoraproject.org> - 3.8.1-1

View File

@ -1 +1 @@
SHA512 (libcxxabi-3.8.1.src.tar.xz) = c401fe984f44c4f7a0b0fa10099d7a203c1552b89881b8b248645ac4fb3cd7e399c3d07841432cca069e816042ad6629f9cc068b278196fa6bd4c129d95d35be
SHA512 (libcxxabi-3.9.1.src.tar.xz) = 4f5603f1476b759c86d4784728fbdd212c59b30dc56d787c1834bf68a9cd83071fa22658d24e5a58beb94c0c656b0e4457d7da6e3048715dd36bd68380fc336e