diff --git a/.cvsignore b/.cvsignore index eb6d1cf..b6a5da5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rhino1_6R5.zip +rhino1_7R2pre.zip diff --git a/rhino-1.6r5-disabledebuggertool.patch b/rhino-1.6r5-disabledebuggertool.patch deleted file mode 100644 index bece543..0000000 --- a/rhino-1.6r5-disabledebuggertool.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./build.xml.sav 2007-03-07 15:06:11.000000000 -0500 -+++ ./build.xml 2007-03-07 15:06:25.000000000 -0500 -@@ -72,7 +72,7 @@ - - - -- -+ - - - diff --git a/rhino-1.7r2pre-disabledebuggertool.patch b/rhino-1.7r2pre-disabledebuggertool.patch new file mode 100644 index 0000000..3a13706 --- /dev/null +++ b/rhino-1.7r2pre-disabledebuggertool.patch @@ -0,0 +1,11 @@ +--- ./build.xml.sav 2007-03-07 15:06:11.000000000 -0500 ++++ ./build.xml 2007-03-07 15:06:25.000000000 -0500 +@@ -73,7 +73,7 @@ + + + +- ++ + + + diff --git a/rhino-build.patch b/rhino-build.patch new file mode 100644 index 0000000..58d66e9 --- /dev/null +++ b/rhino-build.patch @@ -0,0 +1,94 @@ +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 @@ + * Use the convenience method from Context that takes care of calling + * toString, etc. + */ +- public Object getDefaultValue(Class typeHint) { ++ 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 @@ + public class PrimitiveWrapFactory extends WrapFactory { + @Override + public Object wrap(Context cx, Scriptable scope, Object obj, +- Class staticType) ++ Class staticType) + { + 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 @@ + * @return the wrapped value. + */ + public Object wrap(Context cx, Scriptable scope, +- Object obj, Class staticType) ++ Object obj, Class staticType) + { + 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 @@ + + + = 1:1.6.0.0 # Disable xmlbeans until we can get it into Fedora #Requires: xmlbeans @@ -85,56 +87,53 @@ Javadoc for %{name}. %prep %setup -q -n %{name}%{cvs_version} +%patch1 -p1 # Disable the built in swing debugger tool because it uses proprietary code from Sun %patch0 -b .sav # Fix build -%__perl -p -i -e 's|.*\n||' toolsrc/org/mozilla/javascript/tools/debugger/build.xml xmlimplsrc/build.xml +%{__perl} -pi -e 's|.*\n||' build.xml testsrc/build.xml toolsrc/org/mozilla/javascript/tools/debugger/build.xml xmlimplsrc/build.xml -# Disabled until legality of redistribution can be sorted out -#%__install -D -p -m 644 %{SOURCE1} toolsrc/org/mozilla/javascript/tools/debugger/downloaded/swingExSrc.zip +# Disabled until legality can be sorted out. +#%{__install} -D -p -m 644 %{SOURCE1} toolsrc/org/mozilla/javascript/tools/debugger/downloaded/swingExSrc.zip -# Fix path between manual and javadocs -%__perl -p -i -e 's|"apidocs/index.html"|"%{_javadocdir}/%{name}-%{version}/index.html"|' docs/doc.html # Fix manifest -%__perl -p -i -e 's|^Class-Path:.*\n||g' src/manifest +%{__perl} -pi -e 's|^Class-Path:.*\n||g' src/manifest + # Add jpp release info to version -%__perl -p -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date}|\ -implementation.version: Rhino %{version} release %{release} \${implementation.date}|' build.properties +%{__perl} -pi -e 's|^implementation.version: Rhino .* release .* \${implementation.date}|implementation.version: Rhino %{version} release %{release} \${implementation.date}|' build.properties %build -export CLASSPATH=$(build-classpath bea-stax-api) -%ant \ - -Dbuild.sysclasspath=first \ - -Dxbean.jar=$(build-classpath xmlbeans/xbean) \ - jar javadoc +export CLASSPATH= +export OPT_JAR_LIST=: +%ant -Dxbean.jar=$(build-classpath xmlbeans/xbean) \ + -Djsr173.jar=$(build-classpath bea-stax-api) deepclean jar copy-all javadoc pushd examples - # xbeans component is optional. Disabled until we can get it into Fedora #export CLASSPATH=../build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean) -export CLASSPATH=../build/%{name}%{cvs_version}/js.jar -%javac *.java +export CLASSPATH=../build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null) +%{javac} *.java +%{jar} cvf ../build/%{name}%{cvs_version}/%{name}-examples-%{version}.jar *.class popd %install %__rm -rf %{buildroot} # jars -%__mkdir_p %{buildroot}%{_javadir} -%__cp -pa build/%{name}%{cvs_version}/js.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -(cd %{buildroot}%{_javadir} && %__ln_s %{name}-%{version}.jar js-%{version}.jar) -(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +%{__mkdir_p} %{buildroot}%{_javadir} +%{__cp} -a build/%{name}%{cvs_version}/js.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +%{__cp} -a build/%{name}%{cvs_version}/%{name}-examples-%{version}.jar %{buildroot}%{_javadir}/%{name}-examples-%{version}.jar +(cd %{buildroot}%{_javadir} && %{__ln_s} %{name}-%{version}.jar js-%{version}.jar) +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| %{__sed} "s|-%{version}||g"`; done) # javadoc -%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version} -for file in `find build/%{name}%{cvs_version}/docs/apidocs -type f`; do - %{__sed} -i 's/\r//' $file -done - -%__cp -pa build/%{name}%{cvs_version}/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version} +%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} +%{__cp} -a build/%{name}%{cvs_version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} +%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} +%{_bindir}/find %{buildroot}%{_javadocdir}/%{name}-%{version} -type f -name '*.html' | %{_bindir}/xargs %{__perl} -pi -e 's/\r$//g' # Disable the swing debugger tool script because it uses proprietary code from Sun ## script @@ -142,8 +141,8 @@ done #%__install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name} # examples -%__mkdir_p %{buildroot}%{_datadir}/%{name} -%__cp -pa examples/* %{buildroot}%{_datadir}/%{name} +%{__mkdir_p} %{buildroot}%{_datadir}/%{name} +%{__cp} -a examples/* %{buildroot}%{_datadir}/%{name} %clean %__rm -rf %{buildroot} @@ -160,13 +159,19 @@ done %files manual %defattr(0644,root,root,0755) +%if 0 %doc build/%{name}%{cvs_version}/docs/* +%endif %files javadoc %defattr(0644,root,root,0755) %doc %{_javadocdir}/* %changelog +* Fri Feb 13 2009 Lillian Angel - 0:1.7-0.1.r2pre.1.1 +- Upgraded to 1.7r2pre. +- Resolves: rhbz#485135 + * Thu Jul 10 2008 Tom "spot" Callaway - 0:1.6-0.1.r5.1.3 - drop repotag - fix license tag diff --git a/sources b/sources index c7c38b1..1da0988 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c93b6d0bb8ba83c3760efeb30525728a rhino1_6R5.zip +d891a156695f1f51450899424a3ca0dc rhino1_7R2pre.zip