From c8537006c520c111a9dc884aa954c0b1c8434ee0ac4f8732db6950aea978d3e3 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 11 Oct 2023 08:15:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/parboiled?expand=0&rev=21

---
 parboiled.spec | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/parboiled.spec b/parboiled.spec
index b4582dd..eb0f4e1 100644
--- a/parboiled.spec
+++ b/parboiled.spec
@@ -17,8 +17,12 @@
 
 
 %global base_name parboiled
+Name:           %{base_name}
 Version:        1.4.1
 Release:        0
+Summary:        Java library providing parsing of input text based on PEGs
+License:        Apache-2.0
+Group:          Development/Libraries/Java
 URL:            http://parboiled.org/
 Source0:        https://github.com/sirthias/parboiled/archive/%{version}.tar.gz
 Source1:        %{base_name}-build.tar.xz
@@ -28,18 +32,14 @@ Source3:        https://repo1.maven.org/maven2/org/parboiled/%{base_name}-java/%
 Patch0:         restore-java8-compatibility.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
-BuildArch:      noarch
-Name:           %{base_name}
-Summary:        Java library providing parsing of input text based on PEGs
-License:        Apache-2.0
-Group:          Development/Libraries/Java
-BuildRequires:  java-devel >= 9
 BuildRequires:  objectweb-asm
 Requires:       mvn(org.ow2.asm:asm)
 Requires:       mvn(org.ow2.asm:asm-analysis)
 Requires:       mvn(org.ow2.asm:asm-tree)
 Requires:       mvn(org.ow2.asm:asm-util)
+BuildArch:      noarch
 
 %description
 parboiled is a mixed Java library providing parsing of
@@ -60,9 +60,6 @@ This package contains javadoc for %{name}.
 %setup -q -n %{base_name}-%{version} -a1
 %patch0 -p1
 
-find . -name "*.class" -delete
-find . -name "*.jar" -delete
-
 cp %{SOURCE2} %{base_name}-core/pom.xml
 cp %{SOURCE3} %{base_name}-java/pom.xml
 
@@ -81,7 +78,7 @@ for i in %{modules}; do
   # jar
   install -pm 0644 %{base_name}-${i}/target/%{base_name}-${i}*%{version}.jar %{buildroot}%{_javadir}/%{base_name}/${i}.jar
   # pom
-  %mvn_install_pom %{base_name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}/${i}.pom
+  %{mvn_install_pom} %{base_name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}/${i}.pom
   %add_maven_depmap %{base_name}/${i}.pom %{base_name}/${i}.jar
   # javadoc
   install -dm 0755 %{buildroot}%{_javadocdir}/%{base_name}/${i}