diff --git a/Rhino1_7_14_Release.tar.gz b/Rhino1_7_14_Release.tar.gz
deleted file mode 100644
index e574ccd..0000000
--- a/Rhino1_7_14_Release.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1f6ac68ea7e3e946a221b49a99986aa650a00392ccd5f188158d7c88b1d5a206
-size 4694660
diff --git a/Rhino1_7_15_Release.tar.gz b/Rhino1_7_15_Release.tar.gz
new file mode 100644
index 0000000..3e65166
--- /dev/null
+++ b/Rhino1_7_15_Release.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ec54affd63c43637b540e7ff98556ae59bfe57c54e8b8537ff4fc46fe7959ac
+size 4905971
diff --git a/rhino-1.7.14.pom b/rhino-1.7.15.pom
similarity index 97%
rename from rhino-1.7.14.pom
rename to rhino-1.7.15.pom
index a0c4664..1ef4e4e 100644
--- a/rhino-1.7.14.pom
+++ b/rhino-1.7.15.pom
@@ -3,7 +3,7 @@
4.0.0
org.mozilla
rhino
- 1.7.14
+ 1.7.15
Rhino is an open-source implementation of JavaScript written entirely in Java.
It is typically embedded into Java applications to provide scripting to end users.
diff --git a/rhino-build.xml b/rhino-build.xml
index cfd45dd..61c6b16 100644
--- a/rhino-build.xml
+++ b/rhino-build.xml
@@ -10,7 +10,7 @@
-
+
diff --git a/rhino-engine-1.7.14.pom b/rhino-engine-1.7.15.pom
similarity index 95%
rename from rhino-engine-1.7.14.pom
rename to rhino-engine-1.7.15.pom
index 8a963dd..c200fb7 100644
--- a/rhino-engine-1.7.14.pom
+++ b/rhino-engine-1.7.15.pom
@@ -3,7 +3,7 @@
4.0.0
org.mozilla
rhino-engine
- 1.7.14
+ 1.7.15
Rhino Javascript JSR-223 Script Engine wrapper.
@@ -32,7 +32,7 @@
org.mozilla
rhino
- 1.7.14
+ 1.7.15
diff --git a/rhino-runtime-1.7.14.pom b/rhino-runtime-1.7.15.pom
similarity index 97%
rename from rhino-runtime-1.7.14.pom
rename to rhino-runtime-1.7.15.pom
index e24035a..4594a29 100644
--- a/rhino-runtime-1.7.14.pom
+++ b/rhino-runtime-1.7.15.pom
@@ -3,7 +3,7 @@
4.0.0
org.mozilla
rhino-runtime
- 1.7.14
+ 1.7.15
Rhino JavaScript runtime jar, excludes tools & JSR-223 Script Engine wrapper.
diff --git a/rhino.changes b/rhino.changes
index f7d7174..7863cd1 100644
--- a/rhino.changes
+++ b/rhino.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Sun Sep 29 19:41:18 UTC 2024 - Fridrich Strba
+
+- Fix build after removal of the default %%{java_home} define
+
+-------------------------------------------------------------------
+Tue Sep 24 14:11:16 UTC 2024 - Fridrich Strba
+
+- Use SOURCE_DATE_EPOCH for reproducible jar mtime
+
+-------------------------------------------------------------------
+Mon Sep 16 13:46:09 UTC 2024 - Gus Kenion
+
+- Update to 1.7.15
+ * Basic support for "rest parameters"
+ * Improvements in Unicode support
+ * "Symbol.species" implemented in many places
+ * More correct property ordering in many places
+ * Miscellaneous improvements and bug fixes
+- Update pom files for 1.7.15
+ * rhino-1.7.14.pom --> rhino-1.7.15.pom
+ * rhino-engine-1.7.14.pom --> rhino-engine-1.7.15.pom
+ * rhino-runtime-1.7.14.pom --> rhino-runtime-1.7.15.pom
+
-------------------------------------------------------------------
Sun Mar 13 15:42:53 UTC 2022 - Fridrich Strba
diff --git a/rhino.spec b/rhino.spec
index 843d972..6cabbdc 100644
--- a/rhino.spec
+++ b/rhino.spec
@@ -1,7 +1,7 @@
#
# spec file for package rhino
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2000-2009, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -17,9 +17,9 @@
#
-%define scm_version 1_7_14
+%define scm_version 1_7_15
Name: rhino
-Version: 1.7.14
+Version: 1.7.15
Release: 0
Summary: JavaScript for Java
License: MPL-2.0
@@ -33,7 +33,7 @@ Source10: %{name}-build.xml
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
-BuildRequires: javapackages-local
+BuildRequires: javapackages-local >= 6
Requires: javapackages-tools
BuildArch: noarch
@@ -72,10 +72,6 @@ API documentation for %{name}.
%prep
%setup -q -n %{name}-Rhino%{scm_version}_Release
cp %{SOURCE10} build.xml
-cp %{SOURCE1} pom.xml
-cp %{SOURCE2} pom-engine.xml
-cp %{SOURCE3} pom-runtime.xml
-%pom_remove_parent pom.xml pom-engine.xml pom-runtime.xml
%build
%{ant} jar javadoc
@@ -84,8 +80,12 @@ pushd examples
export CLASSPATH=../target/%{name}-%{version}.jar
SOURCEPATH=../src
-%javac -sourcepath ${SOURCEPATH} -source 8 -target 8 *.java
-%jar cvf ../target/%{name}-examples-%{version}.jar *.class
+javac -sourcepath ${SOURCEPATH} -source 8 -target 8 *.java
+jar --create --verbose \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
+ --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \
+%endif
+ --file=../target/%{name}-examples-%{version}.jar *.class
popd
@@ -104,11 +104,11 @@ install -pm 0644 target/%{name}-runtime-%{version}.jar %{buildroot}%{_javadir}/%
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar -a "rhino:js"
-install -pm 0644 pom-engine.xml %{buildroot}%{_mavenpomdir}/%{name}-engine.pom
+%{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}-engine.pom
%add_maven_depmap %{name}-engine.pom %{name}-engine.jar -f engine
-install -pm 0644 pom-runtime.xml %{buildroot}%{_mavenpomdir}/%{name}-runtime.pom
+%{mvn_install_pom} %{SOURCE3} %{buildroot}%{_mavenpomdir}/%{name}-runtime.pom
%add_maven_depmap %{name}-runtime.pom %{name}-runtime.jar -f runtime
# javadoc