From 4cd54af8429c7c32cca9b90017eff42d9734b920 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 18 Sep 2024 14:50:02 +0200
Subject: [PATCH] Use java annotation removal tool

---
 java-runtime-decompiler.spec | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/java-runtime-decompiler.spec b/java-runtime-decompiler.spec
index 5e344f8..831f745 100644
--- a/java-runtime-decompiler.spec
+++ b/java-runtime-decompiler.spec
@@ -43,6 +43,7 @@ BuildRequires: java-devel
 BuildRequires: google-gson
 BuildRequires: desktop-file-utils
 BuildRequires: classpathless-compiler
+BuildRequires: jurand
 Requires: google-gson
 Requires: byteman
 Requires: rsyntaxtextarea
@@ -125,6 +126,8 @@ This package provides bindings and requirements to asmtools7 disassembler and as
 %patch 63 -p0
 %patch 7 -p1
 
+%java_remove_annotations decompiler_agent runtime-decompiler -s -n SuppressFBWarnings
+
 %build
 pushd runtime-decompiler
 %pom_remove_plugin :maven-jar-plugin
@@ -133,11 +136,6 @@ popd
 %pom_remove_plugin :maven-checkstyle-plugin
 %pom_remove_plugin :formatter-maven-plugin
 %pom_remove_dep :spotbugs-annotations
-a=`find | grep ".*\.java$"`
-for x in $a ; do 
-  #grep -e ".*SuppressFBWarnings.*" $x && echo "^ $x ^"
-  sed "s/.*SuppressFBWarnings.*//g" $x -i
-done
 xmvn --version
 echo $JAVA_HOME
 export JAVA_HOME=/usr/lib/jvm/java-21-openjdk #why?