From e7b81d4bd9d9a3898d291114bdd0ddef314f62af Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 4 Oct 2019 08:10:15 -0500 Subject: [PATCH 1/4] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 2f5db63aade978d2355ff33b37650db539106d55 Mon Sep 17 00:00:00 2001 From: Riccardo Schirone Date: Tue, 4 Feb 2020 16:30:05 +0100 Subject: [PATCH 2/4] Do not use libuv as it is not shipped in RHEL8 --- radare2.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/radare2.spec b/radare2.spec index b39f567..b17ad25 100644 --- a/radare2.spec +++ b/radare2.spec @@ -80,7 +80,6 @@ BuildRequires: pkgconfig(libzip) BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(capstone) >= 3.0.4 -BuildRequires: pkgconfig(libuv) BuildRequires: pkgconfig(openssl) Requires: %{name}-common = %{version}-%{release} @@ -209,7 +208,7 @@ echo "Available under https://github.com/radare/radare2-webui" >> ./shlr/www/REA -Duse_sys_lz4=true \ -Duse_sys_xxhash=true \ -Duse_sys_openssl=true \ - -Duse_libuv=true \ + -Duse_libuv=false \ %ifarch s390x -Ddebugger=false \ %endif From fb70a00e5c41c23c4b9c480df510021a6edeb571 Mon Sep 17 00:00:00 2001 From: Riccardo Schirone Date: Thu, 30 Jul 2020 11:48:22 +0200 Subject: [PATCH 3/4] Add patch to reduce required meson version --- radare2-meson-version.patch | 9 +++++++++ radare2.spec | 5 +++++ 2 files changed, 14 insertions(+) create mode 100644 radare2-meson-version.patch diff --git a/radare2-meson-version.patch b/radare2-meson-version.patch new file mode 100644 index 0000000..64f848b --- /dev/null +++ b/radare2-meson-version.patch @@ -0,0 +1,9 @@ +diff -up radare2-4.5.0/meson.build.orig radare2-4.5.0/meson.build +--- radare2-4.5.0/meson.build.orig 2020-07-30 11:41:05.385283528 +0200 ++++ radare2-4.5.0/meson.build 2020-07-30 11:41:18.063292450 +0200 +@@ -1,4 +1,4 @@ +-project('radare2', 'c', license: 'LGPL3', meson_version: '>=0.50.1') ++project('radare2', 'c', license: 'LGPL3', meson_version: '>=0.49.1') + + py3_exe = import('python').find_installation('python3') + git_exe = find_program('git', required: false) diff --git a/radare2.spec b/radare2.spec index b45d6bf..9d34f94 100644 --- a/radare2.spec +++ b/radare2.spec @@ -24,6 +24,8 @@ Release: 0.%{rel}.%{gitdate}git%{shortcommit}%{?dist} Source0: https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{commit}.zip %endif +Patch1: radare2-meson-version.patch + License: LGPLv3+ and GPLv2+ and BSD and MIT and ASL 2.0 and MPLv2.0 and zlib # Radare2 as a package is targeting to be licensed/compiled as LGPLv3+ # during build for Fedora the GPL code is not omitted so effectively it is GPLv2+ @@ -183,6 +185,9 @@ information %if %{with build_release} # Build from git release version %setup -n %{gitname}-%{version} +%if 0%{?epel} +%patch1 -p1 +%endif %else # Build from git commit %setup -q -n %{gitname}-%{commit} From 29c2777aa267045535d5c6e40f75b5c5271e0ae7 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 17:32:20 +0000 Subject: [PATCH 4/4] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file