From 4a05643968517159074d14639f094e32c28799d1dc41d1313141a97fbe97f329 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 17 May 2018 19:58:12 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/rhino?expand=0&rev=38

---
 rhino.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rhino.spec b/rhino.spec
index 6df2830..f9d6867 100644
--- a/rhino.spec
+++ b/rhino.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package rhino
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2009, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -22,7 +22,7 @@ Name:           rhino
 Version:        1.7R3
 Release:        0
 Summary:        JavaScript for Java
-License:        MPL-1.1 OR GPL-2.0+
+License:        MPL-1.1 OR GPL-2.0-or-later
 Group:          Development/Libraries/Java
 Url:            http://www.mozilla.org/rhino/
 # wget ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{cvs_version}.zip

From 516b3f5e6523fda5b85993eb81623631cd6949f837a17c97d52464d5fc2b00b9 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sun, 18 Nov 2018 16:33:30 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/rhino?expand=0&rev=39

---
 rhino.changes |  7 +++++++
 rhino.spec    | 15 +++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/rhino.changes b/rhino.changes
index 3b4279f..9428269 100644
--- a/rhino.changes
+++ b/rhino.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Nov 18 16:32:33 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Actually use the rhino-js.pom file in the source package.
+- Add "org.mozilla:rhino" alias, since the later 1.7.x versions
+  are distributed as such
+
 -------------------------------------------------------------------
 Tue Oct  3 06:51:14 UTC 2017 - fstrba@suse.com
 
diff --git a/rhino.spec b/rhino.spec
index f9d6867..bc1209c 100644
--- a/rhino.spec
+++ b/rhino.spec
@@ -13,7 +13,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -49,7 +49,7 @@ Patch100:       rhino-1.7-gcj.patch
 BuildRequires:  ant
 BuildRequires:  bea-stax-api
 BuildRequires:  java-devel >= 1.6
-BuildRequires:  javapackages-tools
+BuildRequires:  javapackages-local
 BuildRequires:  jline
 BuildRequires:  xmlbeans-mini
 #!BuildIgnore:  antlr
@@ -123,6 +123,11 @@ mkdir -p %{buildroot}%{_javadir}
 cp -a build/%{name}%{cvs_version}/js.jar %{buildroot}%{_javadir}
 ln -s js.jar %{buildroot}%{_javadir}/%{name}.jar
 
+# pom
+mkdir -p %{buildroot}%{_mavenpomdir}
+cp -a %{SOURCE6} %{buildroot}%{_mavenpomdir}/js.pom
+%add_maven_depmap js.pom js.jar -a "org.mozilla:rhino"
+
 # scripts
 mkdir -p %{buildroot}%{_bindir}
 install -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
@@ -142,6 +147,12 @@ cp -a build/%{name}%{cvs_version}/%{name}-examples.jar %{buildroot}%{_javadir}/%
 %attr(0755,root,root) %{_bindir}/%{name}-idswitch
 %attr(0755,root,root) %{_bindir}/%{name}-jsc
 %{_javadir}/*.jar
+%{_mavenpomdir}/*.pom
+%if %{defined _maven_repository}
+%config(noreplace) %{_mavendepmapfragdir}/%{name}
+%else
+%{_datadir}/maven-metadata/%{name}.xml
+%endif
 
 %files demo
 %{_datadir}/%{name}