The package rpms/cutter-re.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cutter-re.git/commit/?id=5bb2e934....
Change:
-%ifarch %{qt5_qtwebengine_arches}
Thanks.
Full change:
============
commit 5bb2e93476ca7f91d58d41020fbc1e25a36d83d2
Author: Riccardo Schirone <sirmy15(a)gmail.com>
Date: Mon Jul 27 15:39:28 2020 +0200
Rebase to 1.11.0 upstream and add -devel package
diff --git a/.gitignore b/.gitignore
index 09d5831..9c75f4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
/cutter-1.8.3.tar.gz
/cutter-1.9.0.tar.gz
/cutter-1.10.1.tar.gz
-/cutter-re.appdata.xml
-/cutter-re.desktop
/cutter-1.10.2.tar.gz
-/cutter-re-fcn-function-rename.patch
+/cutter-1.11.0.tar.gz
+/d576ccc6bf929f69b079e1cca0cd37b444b78314.tar.gz
diff --git a/cutter-re.appdata.xml b/cutter-re.appdata.xml
new file mode 100644
index 0000000..5a7d89f
--- /dev/null
+++ b/cutter-re.appdata.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+ <id>cutter-re</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-3.0</project_license>
+ <name>Cutter</name>
+ <summary>A Qt and C++ GUI for radare2 reverse engineering
framework</summary>
+
+ <description>
+ <p>
+ Cutter is a free and open-source GUI for radare2. Willing to create an advanced,
customizable and free reverse engineering framework.
+ </p>
+ </description>
+
+ <launchable type="desktop-id">cutter-re.desktop</launchable>
+
+ <screenshots>
+ <screenshot>
+
<
image>https://raw.githubusercontent.com/radareorg/cutter/master/docs/s...
+ <caption>Main UI</caption>
+ </screenshot>
+ </screenshots>
+
+ <url type="homepage">https://cutter.re/docs/</url>
+ <update_contact>xarkes</update_contact>
+
+ <releases>
+ <release version="1.11.0" date="2020-07-24" />
+ <release version="1.10.1" date="2020-01-31" />
+ <release version="1.10.0" date="2019-12-20" />
+ <release version="1.9.0" date="2019-09-06" />
+ <release version="1.8.3" date="2019-07-01" />
+ <release version="1.8.2" date="2019-05-20" />
+ <release version="1.8.1" date="2019-04-14" />
+ <release version="1.8.0" date="2019-03-18" />
+ <release version="1.7.4" date="2019-01-21" />
+ <release version="1.7.3" date="2018-12-26" />
+ <release version="1.7.2" date="2018-10-07" />
+ <release version="1.7.1" date="2018-08-25" />
+ <release version="1.7" date="2018-08-17" />
+ <release version="1.6" date="2018-07-13" />
+ <release version="1.5" date="2018-07-02" />
+ <release version="1.4" date="2018-04-24" />
+ <release version="1.3" date="2018-03-09" />
+ <release version="1.2" date="2018-01-30" />
+ <release version="1.1" date="2017-12-25" />
+ <release version="1.0" date="2017-12-03" />
+ </releases>
+</component>
diff --git a/cutter-re.desktop b/cutter-re.desktop
new file mode 100644
index 0000000..4d9a8b3
--- /dev/null
+++ b/cutter-re.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Cutter
+Exec=cutter-re
+Icon=cutter-re
+Categories=Development;
diff --git a/cutter-re.spec b/cutter-re.spec
index f827785..5e2ef04 100644
--- a/cutter-re.spec
+++ b/cutter-re.spec
@@ -1,6 +1,8 @@
+%global cutter_translations_commit d576ccc6bf929f69b079e1cca0cd37b444b78314
+
Name: cutter-re
-Version: 1.10.2
-Release: 2%{?dist}
+Version: 1.11.0
+Release: 1%{?dist}
Summary: GUI for radare2 reverse engineering framework
# CC-BY-SA: src/img/icons/
@@ -11,18 +13,20 @@ URL:
https://cutter.re/
Source0:
https://github.com/radareorg/cutter/archive/v%{version}/cutter-%{version}...
Source1: cutter-re.desktop
Source2: cutter-re.appdata.xml
+Source3:
https://github.com/radareorg/cutter-translations/archive/%{cutter_transla...
-Patch0: cutter-re-fcn-function-rename.patch
-
-BuildRequires: radare2-devel >= 4.4.0
+BuildRequires: radare2-devel >= 4.5.0
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: make
+BuildRequires: kf5-syntax-highlighting-devel
BuildRequires: python3-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: file-devel
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
+BuildRequires: graphviz-devel
+BuildRequires: qt5-linguist
%ifarch %{qt5_qtwebengine_arches}
BuildRequires: qt5-qtwebengine-devel
%endif
@@ -37,26 +41,32 @@ experience at mind. Cutter is created by reverse engineers for
reverse
engineers.
+%package devel
+Summary: Development files for the cutter-re package
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+Development files for the cutter-re package. See cutter-re package for more
+information.
+
+
%prep
%autosetup -p1 -n cutter-%{version}
+tar --strip-component=1 -xvf %{SOURCE3} -C src/translations
%build
-mkdir build
-cd build
-%ifarch %{qt5_qtwebengine_arches}
-%cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE -DCUTTER_ENABLE_QTWEBENGINE=ON ../src
-%else
-%cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE -DCUTTER_ENABLE_QTWEBENGINE=OFF ../src
-%endif
-make %{?_smp_mflags}
+%cmake src
+%cmake_build
%install
-mkdir -p %{buildroot}%{_bindir}
-install build/Cutter %{buildroot}%{_bindir}/cutter-re
+%cmake_install
+mv %{buildroot}%{_bindir}/Cutter %{buildroot}%{_bindir}/cutter-re
+# replace default .desktop file with our own, to use cutter-re name
mkdir -p %{buildroot}%{_datadir}/applications
+rm %{buildroot}%{_datadir}/applications/org.radare.Cutter.desktop
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
%{SOURCE1}
@@ -64,10 +74,11 @@ mkdir -p %{buildroot}%{_metainfodir}
install -pm644 %{SOURCE2} \
%{buildroot}%{_metainfodir}
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
-install -pm644 src/img/cutter.svg \
- %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/cutter-re.svg
+# rename cutter svg icon to cutter-re
+mv %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/{cutter,cutter-re}.svg
+# make sure CMake files used to find cutter development files reference cutter-re and not
Cutter
+sed -i 's/bin\/Cutter/bin\/cutter-re/g'
%{buildroot}%{_libdir}/Cutter/CutterTargets-noconfig.cmake
%check
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
@@ -76,13 +87,26 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/*.appdata.xml
%files
%{_bindir}/cutter-re
%{_datadir}/applications/*.desktop
+%{_datadir}/RadareOrg/Cutter/translations/*.qm
%{_metainfodir}/*.appdata.xml
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%license COPYING src/img/icons/Iconic-LICENSE
%doc README.md
+%files devel
+%{_includedir}/cutter
+%{_libdir}/Cutter/*.cmake
+%dir %{_libdir}/Cutter
+
+
%changelog
+* Mon Jul 27 2020 Riccardo Schirone <rschirone91(a)gmail.com> - 1.11.0-1
+- Bump to upstream version 1.11.0-1 (Thanks to Michal Ambroz, changes mostly
+ taken from
https://src.fedoraproject.org/rpms/cutter-re/pull-request/2#request_diff)
+- Add cutter translations
+- Provide -devel sub package to allow compilation of cutter plugins
+
* Fri May 8 2020 Riccardo Schirone <rschirone91(a)gmail.com> - 1.10.2-2
- Just re-build
diff --git a/sources b/sources
index f4023ff..3278ce5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
-SHA512 (cutter-1.10.2.tar.gz) =
e900e8b0138c6dba5196629f1d7b3fcb5b0b8e29b719672aff3dc8474ef7d6503e3ac07d7a4bfc975e0256e5957dde9bfbd91362f069512fff25bc2691bf1474
-SHA512 (cutter-re.desktop) =
f1bca22a854d50af37fdb298c34b743b060913b9004f25d9169a79bfc02a3235c7e3a4d702108734441f1dc741069c0e49f55e70a13432672b8126c3df7f67c1
-SHA512 (cutter-re.appdata.xml) =
974d9cca569c6f974f90f24baa1771ac6061801a16403e37db19082d9acc67b49c2a8172d853e7ce3d7f0cef53fd75c4bd9b406d95a4bc2c1c3a42141972ba37
-SHA512 (cutter-re-fcn-function-rename.patch) =
e12b9fbf2caaf5b96e39ddf3a7d0d271f26f13f16ecead5fbf38e838759571d33877eab13ab4e7fcfa0fb9c45d50d739fc1cf7466945bc107f943227a5074428
+SHA512 (d576ccc6bf929f69b079e1cca0cd37b444b78314.tar.gz) =
0ee035af3f3740ae1595b19f738e3b4109f55807d7f6ac0f89bbb22fb62864b4fbd4e1afa67d84bcc231dc872668dd9a69d112f78b1c07e92a1210e2807ffe0d
+SHA512 (cutter-1.11.0.tar.gz) =
a69efee672fb0e142ac6c1fae287c463ec1e777a2ec6b604f412fd0c21b0614d2f05a289beb4602af70d6446f0a6263b353dcbd38d41a6466ae2cdbd14e0bea3