diff --git a/radare2.spec b/radare2.spec index cebddd5..e6d0078 100644 --- a/radare2.spec +++ b/radare2.spec @@ -1,20 +1,21 @@ -# by default it builds from the released version of radare2 -%bcond_without build_release - Name: radare2 Summary: The reverse engineering framework Version: 5.2.0 +%global rel 2 URL: https://radare.org/ -VCS: https://github.com/radare/radare2 +VCS: https://github.com/radareorg/radare2 -%global gituser radare +# by default it builds from the released version of radare2 +# to build fro git use rpmbuild --without=build_release +%bcond_without build_release + +%global gituser radareorg %global gitname radare2 -%global gitdate 20190401 -%global commit 3c41cb7d7ed018509a24c2e370d79a91c642ed07 +%global gitdate 20210411 +%global commit cf3db945083fb4dab951874e5ec1283128deab11 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global rel 1 %if %{with build_release} Release: %{rel}%{?dist} @@ -60,10 +61,7 @@ License: LGPLv3+ and GPLv2+ and BSD and MIT and ASL 2.0 and MPLv2.0 and z # shlr/www/p/vendors/dagre*|graphlib* - 3 clause BSD # shlr/www/p/vendors/jquery.onoff.min.js - MIT -%if %{!with build_release} BuildRequires: sed -%endif - BuildRequires: gcc BuildRequires: meson BuildRequires: ninja-build @@ -188,10 +186,10 @@ information %prep %if %{with build_release} # Build from git release version -%setup -n %{gitname}-%{version} +%autosetup -n %{gitname}-%{version} %else # Build from git commit -%setup -q -n %{gitname}-%{commit} +%autosetup -q -n %{gitname}-%{commit} # Rename internal "version-git" to "version" sed -i -e "s|%{version}-git|%{version}|g;" configure configure.acr %endif @@ -205,6 +203,15 @@ echo "The radare2 source usually comes with a pre-built version of the web-inter echo "This has been removed in the Fedora package to follow the Fedora Packaging Guidelines." >> ./shlr/www/README.Fedora echo "Available under https://github.com/radare/radare2-webui" >> ./shlr/www/README.Fedora +%if 0%{?rhel} && 0%{?rhel} == 8 +# Meson on EPEL8 is older than meson on EPEL7 and older than recommended one +# on EPEL8 downgrade the recommendation in meson.build and pray +# meson_version : '>=0.50.1' => meson_version : '>=0.49.1' +sed -i -e "s|meson_version : '>=......'|meson_version : '>=0.49.1'|;" meson.build +%endif + + + %build # Whereever possible use the system-wide libraries instead of bundles %meson \ @@ -280,6 +287,9 @@ rm %{buildroot}/%{_datadir}/doc/%{name}/fortunes.fun %changelog +* Sat Apr 17 2021 Michal Ambroz 5.2.0-2 +- fix epel build + * Wed Apr 14 2021 Henrik Nordstrom - 5.2.0-1 - Update to version 5.2.0