diff --git a/.gitignore b/.gitignore index 7fc9854..43dacec 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/lldb-9.0.1.src.tar.xz +SOURCES/hans-gpg-key.asc +SOURCES/lldb-10.0.1.src.tar.xz diff --git a/.lldb.metadata b/.lldb.metadata index 9bdd321..f8b435e 100644 --- a/.lldb.metadata +++ b/.lldb.metadata @@ -1 +1,2 @@ -3afa0d2573ba55c46360419ed944a729ae08c8f7 SOURCES/lldb-9.0.1.src.tar.xz +32fa4b0193960f05064f2ab31b5a89c7cf48a0b9 SOURCES/hans-gpg-key.asc +90b946ff7b850bcded598509a10d0795e7da3f63 SOURCES/lldb-10.0.1.src.tar.xz diff --git a/SOURCES/lldb-10.0.1.src.tar.xz.sig b/SOURCES/lldb-10.0.1.src.tar.xz.sig new file mode 100644 index 0000000..92465de Binary files /dev/null and b/SOURCES/lldb-10.0.1.src.tar.xz.sig differ diff --git a/SPECS/lldb.spec b/SPECS/lldb.spec index 446d607..643d687 100644 --- a/SPECS/lldb.spec +++ b/SPECS/lldb.spec @@ -1,14 +1,22 @@ -#%%global rc_ver 3 -%global baserelease 2 +#%%global rc_ver 6 +%global baserelease 1 +%global lldb_srcdir %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src Name: lldb -Version: 9.0.1 +Version: 10.0.1 Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: Next generation high-performance debugger License: NCSA URL: http://lldb.llvm.org/ -Source0: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/%{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src.tar.xz +%if 0%{?rc_ver:1} +Source0: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{lldb_srcdir}.tar.xz +Source1: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{lldb_srcdir}.tar.xz.sig +%else +Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{lldb_srcdir}.tar.xz +Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{lldb_srcdir}.tar.xz.sig +%endif +Source2: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc BuildRequires: cmake BuildRequires: llvm-devel = %{version} @@ -49,7 +57,7 @@ Requires: python3-six The package contains the LLDB Python module. %prep -%autosetup -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src -p2 +%autosetup -n %{lldb_srcdir} -p2 %build @@ -80,6 +88,7 @@ CXXFLAGS="%{optflags} -Wno-error=format-security" -DPYTHON_VERSION_MAJOR:STRING=$(%{__python3} -c "import sys; print(sys.version_info.major)") \ -DPYTHON_VERSION_MINOR:STRING=$(%{__python3} -c "import sys; print(sys.version_info.minor)") \ -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ + -DCLANG_LINK_CLANG_DYLIB=ON \ -DLLVM_LIT_ARGS="-sv \ --path %{_libdir}/llvm" \ @@ -117,6 +126,15 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %{python3_sitearch}/lldb %changelog +* Fri Jul 24 2020 sguelton@redhat.com - 10.0.1-1 +- 10.0.1 + +* Mon Jun 15 2020 sguelton@redhat.com - 10.0.0-2 +- Fix multilib integration, see rhbz#1841073 + +* Thu Apr 9 2020 sguelton@redhat.com - 10.0.0-1 +- 10.0.0 final + * Sat Dec 21 2019 Tom Stellard - 9.0.1-1 - 9.0.1 Release