Sync from SUSE:SLFO:1.1 rhino revision a7ef42b3975fd1888d0fb9cf2f2c76d5

rhino-1.7.14.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.mozilla</groupId>
   <artifactId>rhino</artifactId>
-  <version>1.7.15</version>
+  <version>1.7.14</version>
   <description>
     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.

rhino-build.xml

@@ -10,7 +10,7 @@
   <property name="project.artifactId" value="rhino"/>
   <property name="project.artifactId.engine" value="rhino-engine"/>
   <property name="project.artifactId.runtime" value="rhino-runtime"/>
-  <property name="project.version" value="1.7.15"/>
+  <property name="project.version" value="1.7.14"/>
 
   <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>

rhino-engine-1.7.14.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.mozilla</groupId>
   <artifactId>rhino-engine</artifactId>
-  <version>1.7.15</version>
+  <version>1.7.14</version>
   <description>
     Rhino Javascript JSR-223 Script Engine wrapper.
 </description>
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.mozilla</groupId>
       <artifactId>rhino</artifactId>
-      <version>1.7.15</version>
+      <version>1.7.14</version>
     </dependency>
   </dependencies>
 </project>

rhino-runtime-1.7.14.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.mozilla</groupId>
   <artifactId>rhino-runtime</artifactId>
-  <version>1.7.15</version>
+  <version>1.7.14</version>
   <description>
     Rhino JavaScript runtime jar, excludes tools &amp; JSR-223 Script Engine wrapper.
 </description>

rhino.changes

@@ -1,27 +1,3 @@
--------------------------------------------------------------------
-Sun Sep 29 19:41:18 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Fix build after removal of the default %%{java_home} define
-
--------------------------------------------------------------------
-Tue Sep 24 14:11:16 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Use SOURCE_DATE_EPOCH for reproducible jar mtime
-
--------------------------------------------------------------------
-Mon Sep 16 13:46:09 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
-
-- 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 <fstrba@suse.com>
 

rhino.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package rhino
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2022 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_15
+%define scm_version 1_7_14
 Name:           rhino
-Version:        1.7.15
+Version:        1.7.14
 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 >= 6
+BuildRequires:  javapackages-local
 Requires:       javapackages-tools
 BuildArch:      noarch
 
@@ -72,6 +72,10 @@ 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
@@ -80,12 +84,8 @@ pushd examples
 
 export CLASSPATH=../target/%{name}-%{version}.jar
 SOURCEPATH=../src
-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
+%javac -sourcepath ${SOURCEPATH} -source 8 -target 8 *.java
+%jar cvf ../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}
-%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar -a "rhino:js"
-%{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}-engine.pom
+install -pm 0644 pom-engine.xml %{buildroot}%{_mavenpomdir}/%{name}-engine.pom
 %add_maven_depmap %{name}-engine.pom %{name}-engine.jar -f engine
-%{mvn_install_pom} %{SOURCE3} %{buildroot}%{_mavenpomdir}/%{name}-runtime.pom
+install -pm 0644 pom-runtime.xml %{buildroot}%{_mavenpomdir}/%{name}-runtime.pom
 %add_maven_depmap %{name}-runtime.pom %{name}-runtime.jar -f runtime
 
 # javadoc