From 75149195cedc0606fe5dbafec9d6a9deedc60ce5 Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Thu, 9 Jul 2020 20:27:53 -0400 Subject: [PATCH 1/3] Update to latest Also drop llvm-static requirement --- .gitignore | 1 + sources | 2 +- umr.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 28c3415..99d1987 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /umr-1139876.tar.xz /umr-cb1cb54.tar.gz /umr-0affde7.tar.gz +/umr-cf9e2f8.tar.gz diff --git a/sources b/sources index 5fdf5f0..f3efe62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (umr-0affde7.tar.gz) = d17ce80555f5c3c78388ae3f5694c93c957dbd5c6c481e495b78d9b6200df64aae762b951d51a418d1337997660fba8513985aca80180fd116cbc94efda7d6e7 +SHA512 (umr-cf9e2f8.tar.gz) = a3342ce5aaef92e8f762a39fe17dd7b7ff25f00612623ea7c16d1c9da4f54259d84e443b45e21074bb2a49a7f8cb22a1046cc1b679e47cbecafd33d14e24d51b diff --git a/umr.spec b/umr.spec index 69d93ea..7ff31b4 100644 --- a/umr.spec +++ b/umr.spec @@ -1,12 +1,12 @@ -%global commit 0affde7b9b7f2136400eb2e53f569d0acc3c50b1 +%global commit cf9e2f8029c3b1871480dc04e0036a20276fbcc0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global gitdate 20191210 +%global gitdate 20200709 %global fgittag %{gitdate}git%{shortcommit} Summary: AMDGPU Userspace Register Debugger Name: umr Version: 1.0 -Release: 6%{?fgittag:.%{fgittag}}%{?dist} +Release: 7%{?fgittag:.%{fgittag}}%{?dist} License: MIT URL: https://gitlab.freedesktop.org/tomstdenis/umr Source0: https://gitlab.freedesktop.org/tomstdenis/%{name}/-/archive/%{shortcommit}/%{name}-%{shortcommit}.tar.gz @@ -19,7 +19,6 @@ Source0: https://gitlab.freedesktop.org/tomstdenis/%{name}/-/archive/%{shortcomm #UMR requires llvm >= 7 to enable llvm features, enable for EL8+/F29+ %if 0%{?rhel} > 7 || 0%{?fedora} > 28 BuildRequires: llvm-devel -BuildRequires: llvm-static %else %global disablellvm 1 %endif @@ -75,6 +74,10 @@ AMDGPU Userspace Register Debugger header files and libraries %{_libdir}/*.a %changelog +* Thu Jul 09 2020 Jeremy Newton - 1.0-7.20200709gitcf9e2f8 +- Update to newer git +- Drop static llvm dependency + * Fri Jan 31 2020 Fedora Release Engineering - 1.0-6.20191210git0affde7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 6bfab65434d1ef37c69e50daa0508e923ee7f945 Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Thu, 9 Jul 2020 21:10:46 -0400 Subject: [PATCH 2/3] Revert "Update to latest" This reverts commit 75149195cedc0606fe5dbafec9d6a9deedc60ce5. --- .gitignore | 1 - sources | 2 +- umr.spec | 11 ++++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 99d1987..28c3415 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /umr-1139876.tar.xz /umr-cb1cb54.tar.gz /umr-0affde7.tar.gz -/umr-cf9e2f8.tar.gz diff --git a/sources b/sources index f3efe62..5fdf5f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (umr-cf9e2f8.tar.gz) = a3342ce5aaef92e8f762a39fe17dd7b7ff25f00612623ea7c16d1c9da4f54259d84e443b45e21074bb2a49a7f8cb22a1046cc1b679e47cbecafd33d14e24d51b +SHA512 (umr-0affde7.tar.gz) = d17ce80555f5c3c78388ae3f5694c93c957dbd5c6c481e495b78d9b6200df64aae762b951d51a418d1337997660fba8513985aca80180fd116cbc94efda7d6e7 diff --git a/umr.spec b/umr.spec index 7ff31b4..69d93ea 100644 --- a/umr.spec +++ b/umr.spec @@ -1,12 +1,12 @@ -%global commit cf9e2f8029c3b1871480dc04e0036a20276fbcc0 +%global commit 0affde7b9b7f2136400eb2e53f569d0acc3c50b1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global gitdate 20200709 +%global gitdate 20191210 %global fgittag %{gitdate}git%{shortcommit} Summary: AMDGPU Userspace Register Debugger Name: umr Version: 1.0 -Release: 7%{?fgittag:.%{fgittag}}%{?dist} +Release: 6%{?fgittag:.%{fgittag}}%{?dist} License: MIT URL: https://gitlab.freedesktop.org/tomstdenis/umr Source0: https://gitlab.freedesktop.org/tomstdenis/%{name}/-/archive/%{shortcommit}/%{name}-%{shortcommit}.tar.gz @@ -19,6 +19,7 @@ Source0: https://gitlab.freedesktop.org/tomstdenis/%{name}/-/archive/%{shortcomm #UMR requires llvm >= 7 to enable llvm features, enable for EL8+/F29+ %if 0%{?rhel} > 7 || 0%{?fedora} > 28 BuildRequires: llvm-devel +BuildRequires: llvm-static %else %global disablellvm 1 %endif @@ -74,10 +75,6 @@ AMDGPU Userspace Register Debugger header files and libraries %{_libdir}/*.a %changelog -* Thu Jul 09 2020 Jeremy Newton - 1.0-7.20200709gitcf9e2f8 -- Update to newer git -- Drop static llvm dependency - * Fri Jan 31 2020 Fedora Release Engineering - 1.0-6.20191210git0affde7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 23272d4434edafa8c775001fadfc9a179d92e490 Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Thu, 9 Jul 2020 21:11:01 -0400 Subject: [PATCH 3/3] Revert "- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild" This reverts commit 149952425b22e9b18278b4dfaa2690c10cb91fcc. --- umr.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/umr.spec b/umr.spec index 69d93ea..00d9121 100644 --- a/umr.spec +++ b/umr.spec @@ -6,7 +6,7 @@ Summary: AMDGPU Userspace Register Debugger Name: umr Version: 1.0 -Release: 6%{?fgittag:.%{fgittag}}%{?dist} +Release: 5%{?fgittag:.%{fgittag}}%{?dist} License: MIT URL: https://gitlab.freedesktop.org/tomstdenis/umr Source0: https://gitlab.freedesktop.org/tomstdenis/%{name}/-/archive/%{shortcommit}/%{name}-%{shortcommit}.tar.gz @@ -75,9 +75,6 @@ AMDGPU Userspace Register Debugger header files and libraries %{_libdir}/*.a %changelog -* Fri Jan 31 2020 Fedora Release Engineering - 1.0-6.20191210git0affde7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Sun Dec 15 2019 Fedora Release Engineering - 1.0-5.20191210git0affde7 - Update to newer git