From 9ce299a29ece7fc207c9b71e8a37cc652d5b993a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <henrik@hno.se>
Date: Wed, 26 Jan 2022 15:18:45 +0100
Subject: [PATCH 1/2] Update to 5.5.4

---
 .gitignore   |  1 +
 radare2.spec | 10 +++++++---
 sources      |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 49d0e0b..e4ff91e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /radare2-5.3.1.tar.gz
 /radare2-5.4.0.tar.gz
 /radare2-5.4.2.tar.gz
+/radare2-5.5.4.tar.gz
diff --git a/radare2.spec b/radare2.spec
index 8aeff18..07b3779 100644
--- a/radare2.spec
+++ b/radare2.spec
@@ -1,6 +1,6 @@
 Name:           radare2
 Summary:        The reverse engineering framework
-Version:        5.4.2
+Version:        5.5.4
 %global         rel             1
 URL:            https://radare.org/
 VCS:            https://github.com/radareorg/radare2
@@ -27,10 +27,10 @@ VCS:            https://github.com/radareorg/radare2
 
 
 %if %{with releasetag}
-Release:        %{rel}%{?dist}.1
+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}.2
+Release:        0.%{rel}.%{gitdate}git%{shortcommit}%{?dist}
 Source0:        https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{commit}.zip
 %endif
 
@@ -316,6 +316,10 @@ mkdir -p %{buildroot}%{_libdir}/%{name}/%{version}
 
 
 %changelog
+<<<<<<< Updated upstream
+* Wed Jan 26 2022 Henrik Nordstrom <henrik@henriknordstrom.net> - 5.5.4-1
+- Update to version 5.5.4
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.2-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 0483dbf..e416603 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (radare2-5.4.2.tar.gz) = 238d36489be6cdd9a59fe2af61f78fb2b9cd48f0529d5023b64b040f3a79ef3712119a9a120603c766a2eef027562032fb500173f8b4be21242559662fda2a9f
+SHA512 (radare2-5.5.4.tar.gz) = b64268a8fcfbd89455b991557c82bb24d5f42471f4424cd971c1143ff604720fb4c00216a7054d72df6bbbdace1b814a6c3538708926c229dd2f8476b7d325da

From 0dd78f8711b98c9d1cecf42687777221dfe33fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <henrik@hno.se>
Date: Wed, 26 Jan 2022 15:20:55 +0100
Subject: [PATCH 2/2] Clean up merge conflict

---
 radare2.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/radare2.spec b/radare2.spec
index 07b3779..3f14126 100644
--- a/radare2.spec
+++ b/radare2.spec
@@ -316,7 +316,6 @@ mkdir -p %{buildroot}%{_libdir}/%{name}/%{version}
 
 
 %changelog
-<<<<<<< Updated upstream
 * Wed Jan 26 2022 Henrik Nordstrom <henrik@henriknordstrom.net> - 5.5.4-1
 - Update to version 5.5.4