From 9cc150a4c78e7af53dc5500af26483eb828352a0d324cbcbf068cfd496c55080 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 30 Jul 2020 06:17:58 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/rhino?expand=0&rev=49

---
 rhino.spec | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/rhino.spec b/rhino.spec
index 3e2b128..b4ccd3b 100644
--- a/rhino.spec
+++ b/rhino.spec
@@ -37,7 +37,6 @@ Patch1:         rhino-addOrbitManifest.patch
 BuildRequires:  ant
 BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-local
-BuildRequires:  sonatype-oss-parent
 Requires:       javapackages-tools
 Requires:       jline1
 BuildArch:      noarch
@@ -58,6 +57,8 @@ Examples for %{name}
 %setup -q -n %{name}-Rhino%{scm_version}_RELEASE
 %patch0 -b .build
 %patch1 -b .fixManifest
+cp %{SOURCE1} pom.xml
+%pom_remove_parent
 
 # Fix manifest
 sed -i -e '/^Class-Path:.*$/d' src/manifest
@@ -89,14 +90,13 @@ install -m 644 man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
 # jars
 mkdir -p %{buildroot}%{_javadir}
-cp -a build/%{name}%{version}/js.jar %{buildroot}%{_javadir}
-ln -s js.jar %{buildroot}%{_javadir}/%{name}.jar
+cp -a build/%{name}%{version}/js.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -s %{name}.jar %{buildroot}%{_javadir}/js.jar
 
 # pom
 mkdir -p %{buildroot}%{_mavenpomdir}
-cp -a %{SOURCE1} %{buildroot}%{_mavenpomdir}/js.pom
-cp -a %{SOURCE1} %{buildroot}%{_mavenpomdir}/rhino.pom
-%add_maven_depmap js.pom js.jar -a "org.mozilla:rhino"
+cp -a pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar -a "rhino:js"
 
 # scripts
 mkdir -p %{buildroot}%{_bindir}
@@ -112,20 +112,15 @@ cp -a build/%{name}%{version}/%{name}-examples.jar %{buildroot}%{_javadir}/%{nam
 
 find %{buildroot}%{_datadir}/%{name} -name '*.build' -delete
 
-%files
+%files -f .mfiles
 %license LICENSE.txt
 %attr(0755,root,root) %{_bindir}/%{name}
 %attr(0755,root,root) %{_bindir}/%{name}-debugger
 %attr(0755,root,root) %{_bindir}/%{name}-idswitch
 %attr(0755,root,root) %{_bindir}/%{name}-jsc
-%{_javadir}/*.jar
-%{_mavenpomdir}/*.pom
+%{_javadir}/js.jar
+%{_javadir}/%{name}-examples.jar
 %{_mandir}/man1/%{name}.1*
-%if %{defined _maven_repository}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml
-%endif
 
 %files demo
 %{_datadir}/%{name}