diff --git a/.gitignore b/.gitignore index dedce23..9b53c0e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /iaito-5.3.1.tar.gz /iaito-5.5.0-beta.tar.gz /iaito-5.6.0-28a1099603b3fa671bfbb226025d1a8c45558471.tar.gz +/iaito-5.6.0-afaa7df.tar.gz diff --git a/iaito.spec b/iaito.spec index 539da2c..48b0741 100644 --- a/iaito.spec +++ b/iaito.spec @@ -1,11 +1,12 @@ Name: iaito Summary: GUI for radare2 reverse engineering framework Version: 5.6.0 -%global rel 2 +%global rel 3 %global upversion %{version}-beta URL: https://radare.org/n/iaito.html VCS: https://github.com/radareorg/iaito/ # https://github.com/radareorg/iaito/releases +# https://github.com/radareorg/iaito-translations/ # by default it builds from the released version of radare2 @@ -15,10 +16,11 @@ VCS: https://github.com/radareorg/iaito/ %global gituser radareorg %global gitname iaito -%global gitdate 20220206 -%global commit 28a1099603b3fa671bfbb226025d1a8c45558471 +%global gitdate 20220303 +%global commit afaa7df55d6b3c16705e095efc15857d131411e9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global iaito_translations_gitdate 20210421 %global iaito_translations_commit 93c0bb887c1a0de66d55fb84f3aa75e662a1dfd5 %if %{with releasetag} @@ -26,7 +28,7 @@ Release: %{rel}%{?dist} Source0: https://github.com/%{gituser}/%{gitname}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz %else Release: 0.%{rel}.%{gitdate}git%{shortcommit}%{?dist} -Source0: https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{version}-%{commit}.tar.gz +Source0: https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz %endif @@ -60,8 +62,9 @@ BuildRequires: qt5-qtwebengine-devel %endif # Generate documentation -BuildRequires: doxygen -BuildRequires: /usr/bin/sphinx-build +# BuildRequires: doxygen +# BuildRequires: /usr/bin/sphinx-build + BuildRequires: python3-breathe BuildRequires: python3-recommonmark @@ -73,6 +76,9 @@ Requires: hicolor-icon-theme Obsoletes: r2cutter < 5.2.0 Provides: r2cutter%{?_isa} = %{version}-%{release} +# There used to be iaito-doc package +Obsoletes: iaito-doc < 5.6.0-0.3.20220303gitafaa7df +# Provides: iaito-doc = %{version}-%{release} %description iaito is a Qt and C++ GUI for radare2. @@ -96,14 +102,14 @@ Provides: r2cutter-devel%{?_isa} = %{version}-%{release} Development files for the iaito package. See iaito package for more information. -%package doc -Summary: Documentation for the iaito package -BuildArch: noarch -Requires: %{name} = %{version}-%{release} +# %%package doc +# Summary: Documentation for the iaito package +# BuildArch: noarch +# Requires: %%{name} = %%{version}-%%{release} -%description doc -Documentation for the iaito package. See iaito package for more -information. +# %%description doc +# Documentation for the iaito package. See iaito package for more +# information. %prep @@ -124,11 +130,11 @@ tar --strip-component=1 -xvf %{SOURCE1} -C src/translations %cmake_build - -cd docs -make html -rm -rf build/html/.buildinfo -mv build/html ../ +# In 2e5cb221f55d9e4127d576ae4033f6d448e0f812 the current documentation was removed +# cd docs +# make html +# rm -rf build/html/.buildinfo +# mv build/html ../ %install @@ -157,10 +163,15 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop %{_libdir}/iaito/*.cmake %dir %{_libdir}/iaito -%files doc -%doc html +# in 2e5cb221f55d9e4127d576ae4033f6d448e0f812 the current documentation was removed +# %%files doc +# %%doc html %changelog +* Thu Mar 03 2022 Michal Ambroz - 5.6.0-0.3.20220303gitafaa7df +- fixes issue in disassembly with not visible arguments +- remove the obsolete docs + * Tue Mar 01 2022 Michal Ambroz - 5.6.0-0.2.20220206git28a1099 - rebuild with radare2 5.6.4 - add missing include #2059619 to compile with the new version of highlighting diff --git a/sources b/sources index 45b253d..a78a70a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (iaito-5.6.0-28a1099603b3fa671bfbb226025d1a8c45558471.tar.gz) = 6f9211cfc4b2c179da19d4854dc3f8f07c2ea14a451be22db07c8874d0964910aa17e9b0326362854f61b90ef0a34b54c31b3af3e4e543f3364535d50d609caf +SHA512 (iaito-5.6.0-afaa7df.tar.gz) = 4ade33030b8baa4e41583ac5b51bda9fb08e28657d6c7547b35c3dd0bdd7462d99f700d68d22ec6293fb08d3964abb2cfe32df44d89492be8d1a6395e1696aa1 SHA512 (iaito-translations-93c0bb887c1a0de66d55fb84f3aa75e662a1dfd5.tar.gz) = 67ea7a8bcd11f72cd6d58fbb4fae443a14a756070fef939b093a961e86278c1b43b7d2d85177f322d98a00735acde9cada6547dfd5e09925b3110c39470cf58f