[rhino] Upgrade to the last upstream prerelease.
Matej Cepl
mcepl at fedoraproject.org
Wed Sep 14 15:55:31 UTC 2011
commit e67ff43fb43576e10d2241dec9589762363cc62a
Author: Matěj Cepl <mcepl at redhat.com>
Date: Wed Sep 14 17:55:14 2011 +0200
Upgrade to the last upstream prerelease.
.gitignore | 1 +
rhino-addOrbitManifest.patch | 17 +++--
rhino-build.patch | 143 ++++++++++++++++++++----------------------
rhino.spec | 16 +++---
sources | 2 +-
5 files changed, 88 insertions(+), 91 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b937d2d..c30916f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
rhino1_7R2.zip
+/rhino1_7R3.zip
diff --git a/rhino-addOrbitManifest.patch b/rhino-addOrbitManifest.patch
index d697522..b58186f 100644
--- a/rhino-addOrbitManifest.patch
+++ b/rhino-addOrbitManifest.patch
@@ -1,11 +1,16 @@
---- src/manifest 2009-03-22 14:32:24.000000000 -0400
-+++ src/manifest 2011-07-07 10:29:37.524424552 -0400
-@@ -1,2 +1,31 @@
+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-Vendor: Mozilla Foundation
+-Implementation-Version: 1.7R2
+-Implementation-Title: Mozilla Rhino 1.7R2
++Implementation-Version: 1.7R3
++Implementation-Title: Mozilla Rhino 1.7R3
+ 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
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Localization: plugin
diff --git a/rhino-build.patch b/rhino-build.patch
index 7798bae..aa1423a 100644
--- a/rhino-build.patch
+++ b/rhino-build.patch
@@ -1,7 +1,7 @@
-diff -ur rhino1_7R2pre.orig/examples/Matrix.java rhino1_7R2pre/examples/Matrix.java
---- rhino1_7R2pre.orig/examples/Matrix.java 2008-07-28 10:45:22.000000000 -0400
-+++ rhino1_7R2pre/examples/Matrix.java 2008-08-11 00:06:20.483267501 -0400
-@@ -249,7 +249,7 @@
+diff -up rhino1_7R3/examples/Matrix.java.build rhino1_7R3/examples/Matrix.java
+--- rhino1_7R3/examples/Matrix.java.build 2011-05-09 20:04:38.000000000 +0200
++++ rhino1_7R3/examples/Matrix.java 2011-09-14 17:37:15.167031995 +0200
+@@ -249,7 +249,7 @@ public class Matrix implements Scriptabl
* Use the convenience method from Context that takes care of calling
* toString, etc.
*/
@@ -9,11 +9,11 @@ diff -ur rhino1_7R2pre.orig/examples/Matrix.java rhino1_7R2pre/examples/Matrix.j
+ public Object getDefaultValue(Class typeHint) {
return "[object Matrix]";
}
-
-diff -ur rhino1_7R2pre.orig/examples/PrimitiveWrapFactory.java rhino1_7R2pre/examples/PrimitiveWrapFactory.java
---- rhino1_7R2pre.orig/examples/PrimitiveWrapFactory.java 2008-07-28 10:45:22.000000000 -0400
-+++ rhino1_7R2pre/examples/PrimitiveWrapFactory.java 2008-08-11 00:07:30.546266985 -0400
-@@ -57,7 +57,7 @@
+
+diff -up rhino1_7R3/examples/PrimitiveWrapFactory.java.build rhino1_7R3/examples/PrimitiveWrapFactory.java
+--- rhino1_7R3/examples/PrimitiveWrapFactory.java.build 2011-05-09 20:04:38.000000000 +0200
++++ rhino1_7R3/examples/PrimitiveWrapFactory.java 2011-09-14 17:37:15.168031994 +0200
+@@ -57,7 +57,7 @@ import org.mozilla.javascript.*;
public class PrimitiveWrapFactory extends WrapFactory {
@Override
public Object wrap(Context cx, Scriptable scope, Object obj,
@@ -22,10 +22,10 @@ diff -ur rhino1_7R2pre.orig/examples/PrimitiveWrapFactory.java rhino1_7R2pre/exa
{
if (obj instanceof String || obj instanceof Number ||
obj instanceof Boolean)
-diff -ur rhino1_7R2pre.orig/src/org/mozilla/javascript/WrapFactory.java rhino1_7R2pre/src/org/mozilla/javascript/WrapFactory.java
---- rhino1_7R2pre.orig/src/org/mozilla/javascript/WrapFactory.java 2008-07-28 10:45:14.000000000 -0400
-+++ rhino1_7R2pre/src/org/mozilla/javascript/WrapFactory.java 2008-08-11 00:07:57.706710143 -0400
-@@ -75,7 +75,7 @@
+diff -up rhino1_7R3/src/org/mozilla/javascript/WrapFactory.java.build rhino1_7R3/src/org/mozilla/javascript/WrapFactory.java
+--- rhino1_7R3/src/org/mozilla/javascript/WrapFactory.java.build 2011-05-09 20:04:34.000000000 +0200
++++ rhino1_7R3/src/org/mozilla/javascript/WrapFactory.java 2011-09-14 17:37:15.169031993 +0200
+@@ -75,7 +75,7 @@ public class WrapFactory
* @return the wrapped value.
*/
public Object wrap(Context cx, Scriptable scope,
@@ -34,75 +34,18 @@ diff -ur rhino1_7R2pre.orig/src/org/mozilla/javascript/WrapFactory.java rhino1_7
{
if (obj == null || obj == Undefined.instance
|| obj instanceof Scriptable)
-diff -ur rhino1_7R2pre.orig/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java rhino1_7R2pre/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
---- rhino1_7R2pre.orig/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2008-07-28 10:45:18.000000000 -0400
-+++ rhino1_7R2pre/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2008-08-11 00:06:20.483267501 -0400
-@@ -67,7 +67,7 @@
- return super.defineClass(name, data, 0, data.length, domain);
- }
-
-- public void linkClass(Class<?> cl) {
-+ public void linkClass(Class cl) {
- resolveClass(cl);
- }
- }
-diff -ur rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java rhino1_7R2pre/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
---- rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java 2008-07-28 10:45:20.000000000 -0400
-+++ rhino1_7R2pre/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java 2008-08-11 00:06:20.483267501 -0400
-@@ -115,7 +115,7 @@
- }
-
- @Override
-- public Object getDefaultValue(Class<?> hint) {
-+ public Object getDefaultValue(Class hint) {
- return uri();
- }
-
-diff -ur rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java rhino1_7R2pre/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
---- rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java 2008-07-28 10:45:20.000000000 -0400
-+++ rhino1_7R2pre/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java 2008-08-11 00:06:20.484267636 -0400
-@@ -145,7 +145,7 @@
- }
-
- @Override
-- public Object getDefaultValue(Class<?> hint) {
-+ public Object getDefaultValue(Class hint) {
- return toString();
- }
-
-diff -ur rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java rhino1_7R2pre/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
---- rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java 2008-07-28 10:45:20.000000000 -0400
-+++ rhino1_7R2pre/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java 2008-08-11 00:06:20.498268536 -0400
-@@ -165,7 +165,7 @@
- }
-
- @Override
-- public final Object getDefaultValue(Class<?> hint) {
-+ public final Object getDefaultValue(Class hint) {
- return this.toString();
- }
-
---- rhino1_7R2pre.orig/xmlimplsrc/buildorig 2009-02-13 14:17:57.000000000 -0500
-+++ rhino1_7R2pre/xmlimplsrc/build.xml 2009-02-13 14:29:42.000000000 -0500
-@@ -67,6 +67,7 @@
-
- <target name="e4x-compile" if="jdk1.5?">
- <javac
-+ bootclasspath="/usr/lib/jvm/java-openjdk/jre/lib/rt.jar"
- srcdir="xmlimplsrc"
- destdir="${classes}"
- deprecation="on"
---- oldbuild.xml 2009-03-23 12:28:10.000000000 -0400
-+++ rhino1_7R2pre/toolsrc/org/mozilla/javascript/tools/debugger/build.xml 2009-03-23 12:28:40.000000000 -0400
+diff -up rhino1_7R3/toolsrc/org/mozilla/javascript/tools/debugger/build.xml.build rhino1_7R3/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
+--- rhino1_7R3/toolsrc/org/mozilla/javascript/tools/debugger/build.xml.build 2011-05-09 20:04:36.000000000 +0200
++++ rhino1_7R3/toolsrc/org/mozilla/javascript/tools/debugger/build.xml 2011-09-14 17:37:15.175031989 +0200
@@ -38,7 +38,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>
-
+
@@ -46,9 +46,9 @@
<!-- Download source from Sun's site, unzip it, remove
the files we don't need, and change the package
@@ -188,5 +131,53 @@ diff -ur rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectI
- <delete file="downloaded/swingExSrc.zip"/>
+ <delete file="treetable/swingExSrc.zip"/>
</target>
-
+
<target name="download" depends="properties,get-swing-ex"/>
+diff -up rhino1_7R3/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java.build rhino1_7R3/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
+--- rhino1_7R3/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java.build 2011-05-09 20:04:36.000000000 +0200
++++ rhino1_7R3/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2011-09-14 17:37:15.170031993 +0200
+@@ -67,7 +67,7 @@ public class JavaPolicySecurity extends
+ return super.defineClass(name, data, 0, data.length, domain);
+ }
+
+- public void linkClass(Class<?> cl) {
++ public void linkClass(Class cl) {
+ resolveClass(cl);
+ }
+ }
+diff -up rhino1_7R3/xmlimplsrc/build.xml.build rhino1_7R3/xmlimplsrc/build.xml
+diff -up rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java.build rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
+--- rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java.build 2011-05-09 20:04:38.000000000 +0200
++++ rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java 2011-09-14 17:37:15.171031993 +0200
+@@ -120,7 +120,7 @@ class Namespace extends IdScriptableObje
+ }
+
+ @Override
+- public Object getDefaultValue(Class<?> hint) {
++ public Object getDefaultValue(Class hint) {
+ return uri();
+ }
+
+diff -up rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java.build rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
+--- rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java.build 2011-05-09 20:04:38.000000000 +0200
++++ rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java 2011-09-14 17:37:15.172031992 +0200
+@@ -150,7 +150,7 @@ final class QName extends IdScriptableOb
+ }
+
+ @Override
+- public Object getDefaultValue(Class<?> hint) {
++ public Object getDefaultValue(Class hint) {
+ return toString();
+ }
+
+diff -up rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java.build rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
+--- rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java.build 2011-05-09 20:04:38.000000000 +0200
++++ rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java 2011-09-14 17:37:15.173031991 +0200
+@@ -165,7 +165,7 @@ abstract class XMLObjectImpl extends XML
+ }
+
+ @Override
+- public final Object getDefaultValue(Class<?> hint) {
++ public final Object getDefaultValue(Class hint) {
+ return this.toString();
+ }
diff --git a/rhino.spec b/rhino.spec
index 0cc5645..7095b21 100644
--- a/rhino.spec
+++ b/rhino.spec
@@ -28,11 +28,11 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define cvs_version 1_7R2
+%define cvs_version 1_7R3
Name: rhino
Version: 1.7
-Release: 0.9.r2%{?dist}
+Release: 0.10.r3%{?dist}
Epoch: 0
Summary: JavaScript for Java
License: MPLv1.1 or GPLv2+
@@ -42,12 +42,10 @@ Source0: ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{cvs_version}.zip
Source2: %{name}.script
Patch0: %{name}-build.patch
-# Patch to try several methods of loading jline library or fail gracefully
-Patch1: %{name}-457336.diff
# 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
-Patch2: %{name}-addOrbitManifest.patch
+Patch1: %{name}-addOrbitManifest.patch
URL: http://www.mozilla.org/rhino/
Group: Development/Libraries/Java
@@ -93,9 +91,8 @@ Javadoc for %{name}.
%prep
%setup -q -n %{name}%{cvs_version}
-%patch0 -p1
-%patch1 -p0 -b .jline
-%patch2
+%patch0 -p1 -b .build
+%patch1 -p1 -b .fixManifest
# Fix build
%{__perl} -pi -e 's|.*<get.*src=.*>\n||' build.xml testsrc/build.xml toolsrc/org/mozilla/javascript/tools/debugger/build.xml xmlimplsrc/build.xml
@@ -168,6 +165,9 @@ popd
%doc %{_javadocdir}/*
%changelog
+* Wed Sep 14 2011 Matěj Cepl <mcepl at redhat.com> - 1.7-0.10.r3
+- New upstream pre-release.
+
* Wed Jul 6 2011 Andrew Overholt <overholt at redhat.com> 0:1.7-0.9.r2
- Inject OSGi metadata from Eclipse Orbit project.
diff --git a/sources b/sources
index a3ccdef..635779f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40d0a9abec8169e42920214b37fa8e0e rhino1_7R2.zip
+99d94103662a8d0b571e247a77432ac5 rhino1_7R3.zip
More information about the scm-commits
mailing list