diff --git a/.gitignore b/.gitignore index f5f50f7..19ed4b8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,3 @@ /umr-8bf83ae.tar.gz /umr-02f162c.tar.gz /umr-1.0.5.tar.gz -/umr-1.0.6.tar.gz -/umr-1.0.7.tar.gz -/umr-1.0.8.tar.gz -/umr-1.0.9.tar.gz -/umr-1.0.10.tar.gz -/umr-1.0.11.tar.gz diff --git a/changelog b/changelog deleted file mode 100644 index 5cc9aa7..0000000 --- a/changelog +++ /dev/null @@ -1,64 +0,0 @@ -* Sat Jan 27 2024 Fedora Release Engineering - 1.0.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 01 2023 Jeremy Newton - 1.0.8-1 -- Update to 1.0.8 - -* Wed Mar 29 2023 Jeremy Newton - 1.0.7-1 -- Update to 1.0.7 - -* Mon Jan 23 2023 Jeremy Newton - 1.0.6-1 -- Update to 1.0.6 - -* Sat Jan 21 2023 Fedora Release Engineering - 1.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Dec 19 2022 Jeremy Newton - 1.0.5-1 -- Update to 1.0.5 - -* Mon Sep 19 2022 Pete Walter - 1.0-14.20220107git02f162c -- Rebuild for llvm 15 - -* Sat Jul 23 2022 Fedora Release Engineering - 1.0-13.20220107git02f162c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.0-12.20220107git02f162c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jan 12 2022 Jeremy Newton - 1.0-11.20220107git02f162c -- Update to newer git - -* Fri Jul 23 2021 Fedora Release Engineering - 1.0-10.20210115git8bf83ae -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 20 2021 Jeremy Newton - 1.0-9.20210115git8bf83ae -- Update to newer git - -* Wed Jul 29 2020 Fedora Release Engineering - 1.0-8.20200709gitcf9e2f8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* 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 - -* Sun Dec 15 2019 Fedora Release Engineering - 1.0-5.20191210git0affde7 -- Update to newer git - -* Sat Jul 27 2019 Fedora Release Engineering - 1.0-4.20190514gitcb1cb54 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed May 29 2019 Jeremy Newton 1.0-3.20190514gitcb1cb54 -- Update to newer git, switch to gitlab - -* Wed Apr 03 2019 Jeremy Newton 1.0-2.20190403git1139876 -- Update to newer git, fixes install issues and all patches upstreamed -- Add missing static provides for devel - -* Thu Mar 21 2019 Jeremy Newton 1.0-1.20190322.git51112c7 -- Initial Package diff --git a/sources b/sources index 7544c5c..4f264ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (umr-1.0.11.tar.gz) = e3102d241f59cad2a91ad2a8e1fa3fd373c638f1c45a48ced2e33611bac2d4ed2a93a221d41d239d4021869cea655cd3f2449fd607cdfb7834d1a0da26dc245f +SHA512 (umr-1.0.5.tar.gz) = 47375034451e74888b83d1229f8a2b43c654585115a5b67e522a5f63789c0cfc06f01ac8a5d67f57245da02c62cf3baefd2361c3afd76d9f62a3ea1593c5164e diff --git a/umr.spec b/umr.spec index 4897d01..453a03a 100644 --- a/umr.spec +++ b/umr.spec @@ -1,10 +1,7 @@ -# UMR is designed to be a static lib -%undefine _cmake_shared_libs - Summary: AMDGPU Userspace Register Debugger Name: umr -Version: 1.0.11 -Release: %autorelease +Version: 1.0.5 +Release: 2%{?dist} License: MIT URL: https://gitlab.freedesktop.org/tomstdenis/umr Source0: https://gitlab.freedesktop.org/tomstdenis/%{name}/-/archive/%{version}/%{name}-%{version}.tar.gz @@ -29,36 +26,38 @@ BuildRequires: libdrm-devel %endif BuildRequires: cmake%{?rhel:3} -BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libpciaccess-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: nanomsg-devel BuildRequires: ncurses-devel BuildRequires: SDL2-devel BuildRequires: zlib-devel Requires: bash-completion -#Disable unnecessary arches, as umr requires the amdgpu kernel module: -ExclusiveArch: x86_64 aarch64 ppc64le riscv64 %description AMDGPU Userspace Register Debugger (UMR) is a tool to read and display, as well as write to AMDGPU device MMIO, PCIE, SMC, and DIDT registers via userspace. +%package devel +Summary: UMR development package +Requires: %{name}%{?_isa} = %{version}-%{release} +Provides: %{name}-static = %{version}-%{release} + +%description devel +AMDGPU Userspace Register Debugger header files and libraries + %prep %autosetup -p1 -n %{name}-%{version} %build %{!?cmake:%global cmake %%cmake3} %cmake %{?disablellvm:-DUMR_NO_LLVM=ON} \ - %{?disablelibdrm:-DUMR_NO_DRM=ON} \ - %{?enablert:-DUMR_NEED_RT=ON} \ - -DCMAKE_BUILD_TYPE="RELEASE" + %{?disablelibdrm:-DUMR_NO_DRM=ON} \ + %{?enablert:-DUMR_NEED_RT=ON} \ + -DCMAKE_BUILD_TYPE="RELEASE" %cmake_build %install %cmake_install -%fdupes %{buildroot}%{_datadir}/%{name} %files %doc README @@ -68,8 +67,58 @@ as write to AMDGPU device MMIO, PCIE, SMC, and DIDT registers via userspace. %{_mandir}/man1/* %{_datadir}/%{name} %{_datadir}/bash-completion/completions/%{name} -#Not including static libs right now -%exclude %{_libdir}/lib*.a + +%files devel +%{_includedir}/umr* +%{_libdir}/*.a %changelog -%autochangelog +* Tue Sep 26 2023 Carl George - 1.0.5-2 +- Rebuild for clang/llvm 15 + +* Mon Dec 19 2022 Jeremy Newton - 1.0.5-1 +- Update to 1.0.5 + +* Mon Sep 19 2022 Pete Walter - 1.0-14.20220107git02f162c +- Rebuild for llvm 15 + +* Sat Jul 23 2022 Fedora Release Engineering - 1.0-13.20220107git02f162c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.0-12.20220107git02f162c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 12 2022 Jeremy Newton - 1.0-11.20220107git02f162c +- Update to newer git + +* Fri Jul 23 2021 Fedora Release Engineering - 1.0-10.20210115git8bf83ae +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 20 2021 Jeremy Newton - 1.0-9.20210115git8bf83ae +- Update to newer git + +* Wed Jul 29 2020 Fedora Release Engineering - 1.0-8.20200709gitcf9e2f8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* 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 + +* Sun Dec 15 2019 Fedora Release Engineering - 1.0-5.20191210git0affde7 +- Update to newer git + +* Sat Jul 27 2019 Fedora Release Engineering - 1.0-4.20190514gitcb1cb54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed May 29 2019 Jeremy Newton 1.0-3.20190514gitcb1cb54 +- Update to newer git, switch to gitlab + +* Wed Apr 03 2019 Jeremy Newton 1.0-2.20190403git1139876 +- Update to newer git, fixes install issues and all patches upstreamed +- Add missing static provides for devel + +* Thu Mar 21 2019 Jeremy Newton 1.0-1.20190322.git51112c7 +- Initial Package