diff --git a/.gitignore b/.gitignore index 1509073..449436c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/lld-9.0.0.src.tar.xz +SOURCES/hans-gpg-key.asc +SOURCES/lld-10.0.0.src.tar.xz diff --git a/.lld.metadata b/.lld.metadata index a1a80fb..f189117 100644 --- a/.lld.metadata +++ b/.lld.metadata @@ -1 +1,2 @@ -021a8c38cf27d63db37d939c7cdec46ffd627be2 SOURCES/lld-9.0.0.src.tar.xz +32fa4b0193960f05064f2ab31b5a89c7cf48a0b9 SOURCES/hans-gpg-key.asc +ed8dc4f73847e084b65f4ad5d2f6670f6f38a8eb SOURCES/lld-10.0.0.src.tar.xz diff --git a/SOURCES/lld-10.0.0.src.tar.xz.sig b/SOURCES/lld-10.0.0.src.tar.xz.sig new file mode 100644 index 0000000..e30a6d4 Binary files /dev/null and b/SOURCES/lld-10.0.0.src.tar.xz.sig differ diff --git a/SPECS/lld.spec b/SPECS/lld.spec index 84d77fa..540ad74 100644 --- a/SPECS/lld.spec +++ b/SPECS/lld.spec @@ -1,7 +1,9 @@ -#%%global rc_ver 3 -%global baserelease 4 +#%%global rc_ver 6 +%global baserelease 1 %global lld_srcdir lld-%{version}%{?rc_ver:rc%{rc_ver}}.src -%global maj_ver 9 +%global maj_ver 10 +%global min_ver 0 +%global patch_ver 0 # Don't include unittests in automatic generation of provides or requires. %global __provides_exclude_from ^%{_libdir}/lld/.*$ @@ -10,15 +12,22 @@ %bcond_with ld_alternative Name: lld -Version: %{maj_ver}.0.0 +Version: %{maj_ver}.%{min_ver}.%{patch_ver} Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: The LLVM Linker License: NCSA URL: http://llvm.org -Source0: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/%{lld_srcdir}.tar.xz +%if 0%{?rc_ver:1} +Source0: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{lld_srcdir}.tar.xz +Source3: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{lld_srcdir}.tar.xz.sig +%else +Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{lld_srcdir}.tar.xz +Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{lld_srcdir}.tar.xz.sig +%endif Source1: run-lit-tests Source2: lit.lld-test.cfg.py +Source4: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc Patch0: 0001-CMake-Check-for-gtest-headers-even-if-lit.py-is-not-.patch @@ -65,12 +74,13 @@ Summary: LLD regression tests Requires: %{name}%{?_isa} = %{version}-%{release} Requires: python3-lit Requires: llvm-test(major) = %{maj_ver} +Requires: lld-libs = %{version}-%{release} %description test LLVM regression tests. %prep -%autosetup -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src -p1 +%autosetup -n %{lld_srcdir} -p1 %build @@ -136,6 +146,7 @@ cd %{_target_platform} # Remove rpath chrpath --delete %{buildroot}%{_bindir}/* chrpath --delete %{buildroot}%{_libdir}/*.so* +chrpath --delete `find %{buildroot}%{_libdir}/lld/ -type f` %if %{with ld_alternative} # Required when using update-alternatives: @@ -183,6 +194,15 @@ make -C %{_target_platform} %{?_smp_mflags} check-lld %{_datadir}/lld/lit.lld-test.cfg.py %changelog +* Thu Apr 9 2020 sguelton@redhat.com - 10.0.0-1 +- 10.0.0 final + +* Thu Dec 19 2019 Tom Stellard -9.0.1-1 +- 9.0.1 Release + +* Fri Dec 13 2019 Tom Stellard - 9.0.0-5 +- Fix some rpmdiff errors + * Fri Dec 13 2019 Tom Stellard - 9.0.0-4 - Remove build artifacts installed with unittests