Hello community, here is the log from the commit of package rhino for openSUSE:Factory checked in at 2020-08-02 12:29:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rhino (Old) and /work/SRC/openSUSE:Factory/.rhino.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rhino" Sun Aug 2 12:29:00 2020 rev:36 rq:823524 version:1.7.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/rhino/rhino.changes 2019-03-04 09:17:06.076636330 +0100 +++ /work/SRC/openSUSE:Factory/.rhino.new.3592/rhino.changes 2020-08-02 12:29:39.839937678 +0200 @@ -1,0 +2,14 @@ +Wed Jul 29 12:19:30 UTC 2020 - Pedro Monreal Gonzalez <[email protected]> + +- Update to 1.7.7.1: + * Release notes: + https://github.com/mozilla/rhino/blob/master/RELEASE-NOTES.md#rhino-1771 +- Rebase patches: + * rhino-addOrbitManifest.patch + * rhino-build.patch +- Remove pathes: + * rhino-1.7R3-crosslink.patch + * rhino-288467.patch + * rhino-1.7-gcj.patch + +------------------------------------------------------------------- Old: ---- rhino-1.7-gcj.patch rhino-1.7R3-crosslink.patch rhino-288467.patch rhino-component-info.xml rhino-js.pom rhino.pom rhino1_7R3-suse.tar.gz New: ---- Rhino1_7_7_1_RELEASE.tar.gz rhino-1.7.7.1.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rhino.spec ++++++ --- /var/tmp/diff_new_pack.7ekKc5/_old 2020-08-02 12:29:40.723938586 +0200 +++ /var/tmp/diff_new_pack.7ekKc5/_new 2020-08-02 12:29:40.727938590 +0200 @@ -1,7 +1,7 @@ # # spec file for package rhino # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -17,51 +17,28 @@ # -%define cvs_version 1_7R3 +%define scm_version 1_7_7_1 Name: rhino -Version: 1.7R3 +Version: 1.7.7.1 Release: 0 Summary: JavaScript for Java -License: MPL-1.1 OR GPL-2.0-or-later +License: MPL-2.0 Group: Development/Libraries/Java -Url: http://www.mozilla.org/rhino/ -# wget ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{cvs_version}.zip -# unzip -q rhino%{cvs_version}.zip -# find rhino%{cvs_version}/ -name '*jar' | xargs rm -rf -# tar -czf rhino%{cvs_version}-suse.tar.gz rhino%{cvs_version}/ -Source0: rhino%{cvs_version}-suse.tar.gz +URL: https://www.mozilla.org/rhino/ +Source0: https://github.com/mozilla/rhino/archive/Rhino%{scm_version}_RELEASE.tar.gz +Source1: https://repo1.maven.org/maven2/org/mozilla/rhino/%{version}/rhino-%{version}.pom Source2: rhino.script Source3: rhino-debugger.script Source4: rhino-idswitch.script Source5: rhino-jsc.script -Source6: rhino-js.pom -Source7: rhino.pom -Source8: rhino-component-info.xml Patch0: rhino-build.patch # Add OSGi metadata from Eclipse Orbit project -# Rip out of MANIFEST.MF included in this JAR: -# http://www.eclipse.org/downloads/download.php?r=1&file=/tools/orbit/downloads/drops/R20110523182458/repository/plugins/org.mozilla.javascript_1.7.2.v201005080400.jar -Patch1: %{name}-addOrbitManifest.patch -Patch2: %{name}-1.7R3-crosslink.patch -Patch3: rhino-288467.patch -#PATCH-FIX-OPENSUSE: allow build under gcj -Patch100: rhino-1.7-gcj.patch +Patch1: rhino-addOrbitManifest.patch BuildRequires: ant -BuildRequires: bea-stax-api -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.7 BuildRequires: javapackages-local -BuildRequires: xmlbeans-mini -#!BuildIgnore: antlr -#!BuildIgnore: antlr-java -#!BuildIgnore: xerces-j2 -#!BuildIgnore: xerces-j2-bootstrap -#!BuildIgnore: xml-commons -#!BuildIgnore: xml-commons-apis -#!BuildIgnore: xml-commons-jaxp-1.3-apis -#!BuildIgnore: xml-commons-resolver -Requires: bea-stax-api +Requires: javapackages-tools Requires: jline1 -Requires: xmlbeans BuildArch: noarch %description @@ -70,21 +47,18 @@ scripting to end users. %package demo -Summary: JavaScript for Java +Summary: Examples for %{name} Group: Development/Libraries/Java %description demo -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. +Examples for %{name} %prep -# % setup -q -n %{name}%{cvs_version} -a 100 -%setup -q -n %{name}%{cvs_version} - -# Fix build -sed -i -e '/.*<get.*src=.*>$/d' build.xml testsrc/build.xml \ - toolsrc/org/mozilla/javascript/tools/debugger/build.xml xmlimplsrc/build.xml +%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 @@ -92,38 +66,35 @@ # Add jpp release info to version sed -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date}|implementation.version: Rhino %{version} release %{release} \${implementation.date}|' build.properties -%setup -q -n %{name}%{cvs_version} -%patch0 -b .build -%patch1 -p1 -b .fixManifest -%patch2 -p1 -b .crosslink -%patch3 -b .sav3 -%patch100 -b .gjc - %build %{ant} \ - -Dxbean.jar=$(build-classpath xmlbeans/xbean | cut -d ':' -f 1) \ - -Djsr173.jar=$(build-classpath bea-stax-api) \ -Dtarget-jvm=6 -Dsource-level=6 \ deepclean jar copy-all -export CLASSPATH=`pwd`/build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null) -SOURCEPATH=`pwd`/build/%{name}%{cvs_version}/src pushd examples -javac -sourcepath ${SOURCEPATH} -source 6 -target 6 *.java -jar cvf ../build/%{name}%{cvs_version}/%{name}-examples.jar *.class + +export CLASSPATH=../build/%{name}%{version}/js.jar +SOURCEPATH=../build/%{name}%{version}/src +%javac -sourcepath ${SOURCEPATH} -source 6 -target 6 *.java +%jar cvf ../build/%{name}%{version}/%{name}-examples.jar *.class + popd %install +# man page +mkdir -p %{buildroot}%{_mandir}/man1/ +install -m 644 man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 + # jars mkdir -p %{buildroot}%{_javadir} -cp -a build/%{name}%{cvs_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 %{SOURCE6} %{buildroot}%{_mavenpomdir}/js.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} @@ -135,21 +106,19 @@ # examples mkdir -p %{buildroot}%{_datadir}/%{name} cp -a examples/* %{buildroot}%{_datadir}/%{name} -cp -a build/%{name}%{cvs_version}/%{name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar +cp -a build/%{name}%{version}/%{name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar + +find %{buildroot}%{_datadir}/%{name} -name '*.build' -delete -%files -%doc LICENSE.txt +%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 -%if %{defined _maven_repository} -%config(noreplace) %{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml -%endif +%{_javadir}/js.jar +%{_javadir}/%{name}-examples.jar +%{_mandir}/man1/%{name}.1%{?ext_man} %files demo %{_datadir}/%{name} ++++++ rhino-js.pom -> rhino-1.7.7.1.pom ++++++ --- /work/SRC/openSUSE:Factory/rhino/rhino-js.pom 2011-09-23 12:44:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rhino.new.3592/rhino-1.7.7.1.pom 2020-08-02 12:29:39.763937599 +0200 @@ -1,25 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> - <modelVersion>4.0.0</modelVersion> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <version>1.7R1</version> - <packaging>jar</packaging> - <name>Rhino</name> - <url>http://www.mozilla.org/rhino/</url> - <description>Rhino: JavaScript for Java</description> - - <licenses> - <license> - <name>Mozilla Public License version 1.1</name> - <url>http://www.mozilla.org/MPL/MPL-1.1.html</url> - <distribution>repo</distribution> - </license> - </licenses> - - <scm> - <url>http://lxr.mozilla.org/mozilla/source/js/rhino/</url> - </scm> + <parent> + <groupId>org.sonatype.oss</groupId> + <artifactId>oss-parent</artifactId> + <version>7</version> + </parent> + <groupId>org.mozilla</groupId> + <artifactId>rhino</artifactId> + <name>Mozilla Rhino</name> + <version>1.7.7.1</version> + + <packaging>jar</packaging> + <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. + </description> + <url>https://developer.mozilla.org/en/Rhino</url> + + <licenses> + <license> + <name>Mozilla Public License, Version 2.0</name> + <url>http://www.mozilla.org/MPL/2.0/index.txt</url> + </license> + </licenses> + + <scm> + <connection>scm:git:[email protected]:mozilla/rhino.git</connection> + <developerConnection>scm:git:[email protected]:mozilla/rhino.git</developerConnection> + <url>[email protected]:mozilla/rhino.git</url> + </scm> + + <organization> + <name>The Mozilla Foundation</name> + <url>http://www.mozilla.org</url> + </organization> </project> ++++++ rhino-addOrbitManifest.patch ++++++ --- /var/tmp/diff_new_pack.7ekKc5/_old 2020-08-02 12:29:40.779938644 +0200 +++ /var/tmp/diff_new_pack.7ekKc5/_new 2020-08-02 12:29:40.779938644 +0200 @@ -1,23 +1,17 @@ -diff -up rhino1_7R3/src/manifest.fixManifest rhino1_7R3/src/manifest ---- rhino1_7R3/src/manifest.fixManifest 2011-05-09 20:04:34.000000000 +0200 -+++ rhino1_7R3/src/manifest 2011-09-14 17:46:28.331978606 +0200 -@@ -1,6 +1,31 @@ - Manifest-Version: 1.0 - Main-Class: org.mozilla.javascript.tools.shell.Main --Implementation-Version: 1.7R2 --Implementation-Title: Mozilla Rhino 1.7R2 -+Implementation-Version: 1.7R3 -+Implementation-Title: Mozilla Rhino 1.7R3 +Index: src/manifest +=================================================================== +--- src/manifest.orig ++++ src/manifest +@@ -4,3 +4,28 @@ Implementation-Version: 1.7.7.1 + Implementation-Title: Mozilla Rhino 1.7.7.1 Implementation-Vendor: Mozilla Foundation --Implementation-URL: http://www.mozilla.org/rhino -\ Chybí znak konce řádku na konci souboru -+Implementation-URL: http://www.mozilla.org/rhino + Implementation-URL: http://www.mozilla.org/rhino +Bundle-Vendor: %Bundle-Vendor.0 +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.mozilla.javascript -+Bundle-Version: 1.7.2.v201005080400 ++Bundle-Version: 1.7.12 +Export-Package: org.mozilla.classfile,org.mozilla.javascript,org.mozil + la.javascript.debug,org.mozilla.javascript.jdk13,org.mozilla.javascri + pt.jdk15,org.mozilla.javascript.optimizer,org.mozilla.javascript.rege ++++++ rhino-build.patch ++++++ --- /var/tmp/diff_new_pack.7ekKc5/_old 2020-08-02 12:29:40.791938656 +0200 +++ /var/tmp/diff_new_pack.7ekKc5/_new 2020-08-02 12:29:40.791938656 +0200 @@ -1,8 +1,6 @@ -Index: examples/Matrix.java -=================================================================== ---- examples/Matrix.java.orig 2011-05-09 20:04:38.000000000 +0200 -+++ examples/Matrix.java 2012-01-13 11:31:47.275360948 +0100 -@@ -249,7 +249,7 @@ +--- examples/Matrix.java ++++ examples/Matrix.java +@@ -218,7 +218,7 @@ public class Matrix implements Scriptabl * Use the convenience method from Context that takes care of calling * toString, etc. */ @@ -11,11 +9,9 @@ return "[object Matrix]"; } -Index: examples/PrimitiveWrapFactory.java -=================================================================== ---- examples/PrimitiveWrapFactory.java.orig 2011-05-09 20:04:38.000000000 +0200 -+++ examples/PrimitiveWrapFactory.java 2012-01-13 11:31:47.276360983 +0100 -@@ -57,7 +57,7 @@ +--- examples/PrimitiveWrapFactory.java ++++ examples/PrimitiveWrapFactory.java +@@ -25,7 +25,7 @@ import org.mozilla.javascript.*; public class PrimitiveWrapFactory extends WrapFactory { @Override public Object wrap(Context cx, Scriptable scope, Object obj, @@ -24,11 +20,9 @@ { if (obj instanceof String || obj instanceof Number || obj instanceof Boolean) -Index: src/org/mozilla/javascript/WrapFactory.java -=================================================================== ---- src/org/mozilla/javascript/WrapFactory.java.orig 2011-05-09 20:04:34.000000000 +0200 -+++ src/org/mozilla/javascript/WrapFactory.java 2012-01-13 11:31:47.277361018 +0100 -@@ -75,7 +75,7 @@ +--- src/org/mozilla/javascript/WrapFactory.java ++++ src/org/mozilla/javascript/WrapFactory.java +@@ -42,7 +42,7 @@ public class WrapFactory * @return the wrapped value. */ public Object wrap(Context cx, Scriptable scope, @@ -37,11 +31,107 @@ { if (obj == null || obj == Undefined.instance || obj instanceof Scriptable) -Index: toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java -=================================================================== ---- toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java.orig 2011-05-09 20:04:36.000000000 +0200 -+++ toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2012-01-13 11:31:47.278361053 +0100 -@@ -67,7 +67,7 @@ +--- toolsrc/org/mozilla/javascript/tools/debugger/build.xml ++++ toolsrc/org/mozilla/javascript/tools/debugger/build.xml +@@ -8,7 +8,7 @@ + + <target name="properties"> + <property name="swing-ex-url" value="http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip"/> +- <available file="downloaded/AbstractCellEditor.java" ++ <available file="treetable/AbstractCellEditor.java" + property="swing-ex-available"/> + </target> + +@@ -16,9 +16,9 @@ + <!-- Download source from Sun's site, unzip it, remove + the files we don't need, and change the package + --> +- <mkdir dir="downloaded"/> +- <get src="${swing-ex-url}" dest="downloaded/swingExSrc.zip"/> +- <unzip src="downloaded/swingExSrc.zip" dest="downloaded/"> ++ <mkdir dir="treetable"/> ++ <get src="${swing-ex-url}" dest="treetable/swingExSrc.zip"/> ++ <unzip src="treetable/swingExSrc.zip" dest="downloaded/"> + <patternset> + <include name="AbstractCellEditor.java"/> + <include name="JTreeTable.java"/> +@@ -26,58 +26,58 @@ + <include name="TreeTableModelAdapter.java"/> + </patternset> + </unzip> +- <replace file="downloaded/AbstractCellEditor.java"> ++ <replace file="treetable/AbstractCellEditor.java"> + <replacetoken>import java.awt.Component;</replacetoken> + <replacevalue> +-package org.mozilla.javascript.tools.debugger.downloaded; ++package org.mozilla.javascript.tools.debugger.treetable; + </replacevalue> + </replace> +- <replace file="downloaded/AbstractCellEditor.java"> ++ <replace file="treetable/AbstractCellEditor.java"> + <replacetoken>import java.awt.event.*;</replacetoken> + <replacevalue></replacevalue> + </replace> +- <replace file="downloaded/AbstractCellEditor.java"> ++ <replace file="treetable/AbstractCellEditor.java"> + <replacetoken>import java.awt.AWTEvent;</replacetoken> + <replacevalue></replacevalue> + </replace> +- <replace file="downloaded/AbstractCellEditor.java"> ++ <replace file="treetable/AbstractCellEditor.java"> + <replacetoken>import java.io.Serializable;</replacetoken> + <replacevalue></replacevalue> + </replace> +- <replace file="downloaded/JTreeTable.java"> ++ <replace file="treetable/JTreeTable.java"> + <replacetoken>import javax.swing.*;</replacetoken> + <replacevalue> +- package org.mozilla.javascript.tools.debugger.downloaded; ++ package org.mozilla.javascript.tools.debugger.treetable; + import javax.swing.*; + </replacevalue> + </replace> +- <replace file="downloaded/JTreeTable.java"> ++ <replace file="treetable/JTreeTable.java"> + <replacetoken>class ListToTreeSelectionModelWrapper</replacetoken> + <replacevalue>public class ListToTreeSelectionModelWrapper</replacevalue> + </replace> +- <replace file="downloaded/JTreeTable.java"> ++ <replace file="treetable/JTreeTable.java"> + <replacetoken>ListSelectionModel getListSelectionModel</replacetoken> + <replacevalue>public ListSelectionModel getListSelectionModel</replacevalue> + </replace> +- <replace file="downloaded/JTreeTable.java"> ++ <replace file="treetable/JTreeTable.java"> + <replacetoken>import java.awt.Rectangle;</replacetoken> + <replacevalue></replacevalue> + </replace> +- <replace file="downloaded/TreeTableModel.java"> ++ <replace file="treetable/TreeTableModel.java"> + <replacetoken>import javax.swing.tree.TreeModel;</replacetoken> + <replacevalue> +- package org.mozilla.javascript.tools.debugger.downloaded; ++ package org.mozilla.javascript.tools.debugger.treetable; + import javax.swing.tree.TreeModel; + </replacevalue> + </replace> +- <replace file="downloaded/TreeTableModelAdapter.java"> ++ <replace file="treetable/TreeTableModelAdapter.java"> + <replacetoken>import javax.swing.JTree;</replacetoken> + <replacevalue> +- package org.mozilla.javascript.tools.debugger.downloaded; ++ package org.mozilla.javascript.tools.debugger.treetable; + import javax.swing.JTree; + </replacevalue> + </replace> +- <delete file="downloaded/swingExSrc.zip"/> ++ <delete file="treetable/swingExSrc.zip"/> + </target> + + <target name="download" depends="properties,get-swing-ex"/> +--- toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java ++++ toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java +@@ -36,7 +36,7 @@ public class JavaPolicySecurity extends return super.defineClass(name, data, 0, data.length, domain); } @@ -50,11 +140,9 @@ resolveClass(cl); } } -Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java -=================================================================== ---- xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java.orig 2011-05-09 20:04:38.000000000 +0200 -+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java 2012-01-13 11:31:47.282361193 +0100 -@@ -120,7 +120,7 @@ +--- xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java ++++ xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java +@@ -86,7 +86,7 @@ class Namespace extends IdScriptableObje } @Override @@ -63,11 +151,9 @@ return uri(); } -Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java -=================================================================== ---- xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java.orig 2011-05-09 20:04:38.000000000 +0200 -+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java 2012-01-13 11:31:47.284361263 +0100 -@@ -150,7 +150,7 @@ +--- xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java ++++ xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java +@@ -116,7 +116,7 @@ final class QName extends IdScriptableOb } @Override @@ -76,11 +162,9 @@ return toString(); } -Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java -=================================================================== ---- xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java.orig 2011-05-09 20:04:38.000000000 +0200 -+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java 2012-01-13 11:31:47.285361298 +0100 -@@ -165,7 +165,7 @@ +--- xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java ++++ xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java +@@ -105,7 +105,7 @@ abstract class XMLObjectImpl extends XML } @Override
