From 1e36c58105a1e643a2e8f357d276c2e15192b3d8 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Tue, 31 Mar 2020 10:37:24 +0000 Subject: [PATCH] 10.0.0 final --- .gitignore | 2 ++ libcxxabi.spec | 18 +++++++++++++----- sources | 4 ++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ba2d6c5..4f6683b 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ /libcxxabi-10.0.0rc5.src.tar.xz.sig /libcxxabi-10.0.0rc6.src.tar.xz /libcxxabi-10.0.0rc6.src.tar.xz.sig +/libcxxabi-10.0.0.src.tar.xz +/libcxxabi-10.0.0.src.tar.xz.sig diff --git a/libcxxabi.spec b/libcxxabi.spec index d5dc92e..e5876e5 100644 --- a/libcxxabi.spec +++ b/libcxxabi.spec @@ -1,5 +1,5 @@ -%global rc_ver 6 -%global baserelease 0.5 +#%%global rc_ver 6 +%global baserelease 1 %global libcxxabi_srcdir libcxxabi-%{version}%{?rc_ver:rc%{rc_ver}}.src @@ -9,8 +9,13 @@ Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: Low level support for a standard C++ library License: MIT or NCSA URL: http://libcxxabi.llvm.org/ -Source0: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/%{libcxxabi_srcdir}.tar.xz -Source3: https://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/%{libcxxabi_srcdir}.tar.xz.sig +%if 0%{?rc_ver:1} +Source0: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{libcxxabi_srcdir}.tar.xz +Source3: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{libcxxabi_srcdir}.tar.xz.sig +%else +Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{libcxxabi_srcdir}.tar.xz +Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{libcxxabi_srcdir}.tar.xz.sig +%endif Source4: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc BuildRequires: clang llvm-devel cmake llvm-static @@ -37,7 +42,7 @@ Summary: Static libraries for libcxxabi %{summary}. %prep -%setup -q -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src +%setup -q -n %{libcxxabi_srcdir} sed -i 's|${LLVM_BINARY_DIR}/share/llvm/cmake|%{_libdir}/cmake/llvm|g' CMakeLists.txt @@ -96,6 +101,9 @@ cp -a include/* %{buildroot}%{_includedir} %{_libdir}/libc++abi.a %changelog +* Tue Mar 31 2020 sguelton@redhat.com - 10.0.0-1 +- 10.0.0 final + * Wed Mar 25 2020 sguelton@redhat.com - 10.0.0-0.5.rc6 - 10.0.0 rc6 diff --git a/sources b/sources index cc14e09..0c2e1a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libcxxabi-10.0.0rc6.src.tar.xz) = f105b1a2a45afaf2c8477016051f21cc23f2b1047d04948b8da5820e54ccbf9606f0fc42801c3ef5adaa8c2a56cf1e4bcb4c53d03b18b281ef81d07c8d0c1688 -SHA512 (libcxxabi-10.0.0rc6.src.tar.xz.sig) = bd79337e951a3377b0be02578d1d113f5fe4b890610baf3ae1013c7728eab93ac23c873bdbeaa7d7dcb0115e8db3020498bef7cdcfb4c11237c63c7b814713c9 +SHA512 (libcxxabi-10.0.0.src.tar.xz) = e58be156f924b0e613a69872c1d42190a4123e9c7a4de973e3f735a23992487df91549756c8acee81a35f9575f5b3001e748f8b01439f233660a18f4a45b0f32 +SHA512 (libcxxabi-10.0.0.src.tar.xz.sig) = 11630d9383213306881ff2cca4ae29b05ea48d265daa60f2e671d1ae4dafcc2900ea1b2a123ec3cd924fd17e1360812622632a6d928dd3bfd85c0b66d4d3326a