Index: rhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhino/devel/rhino.spec,v
retrieving revision 1.2
diff -u -r1.2 rhino.spec
--- rhino.spec	15 Mar 2007 17:41:39 -0000	1.2
+++ rhino.spec	9 Jan 2008 10:57:19 -0000
@@ -32,18 +32,17 @@
 
 Name:           rhino
 Version:        1.6
-Release:        0.1.r5.1jpp.2%{?dist}
+Release:        0.1.r5.1jpp.3%{?dist}
 Epoch:          0
 Summary:        JavaScript for Java
-License:        MPL
+License:        MPL and LGPLv2
 
 Source0:        ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{cvs_version}.zip
 
-# Disabled until legality of redistribution can be sorted out
-#Source1:        http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip
-#Source2:        %{name}.script
+Source1:        http://external.openoffice.org/source/browse/*checkout*/external/rhino/download/swingExSrc.zip
+Source2:        %{name}.script
 
-Patch0:         %{name}-1.6r5-disabledebuggertool.patch
+Patch0:         %{name}-1.6r5-useOOoSwingEx.patch
 URL:            http://www.mozilla.org/rhino/
 Group:          Development/Libraries/Java
 
@@ -86,14 +85,13 @@
 %prep
 %setup -q -n %{name}%{cvs_version}
 
-# Disable the built in swing debugger tool because it uses proprietary code from Sun
-%patch0 -b .sav
+# use the OpenOffice.org swingExSrc.zip replacement
+%patch0 -p1 -b .sav
 
 # Fix build
 %__perl -p -i -e 's|.*<get.*src=.*>\n||' 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
+%__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
@@ -136,10 +134,9 @@
 
 %__cp -pa build/%{name}%{cvs_version}/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 
-# Disable the swing debugger tool script because it uses proprietary code from Sun 
-## script
-#%__mkdir_p %{buildroot}%{_bindir}
-#%__install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
+# script
+%__mkdir_p %{buildroot}%{_bindir}
+%__install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
 
 # examples
 %__mkdir_p %{buildroot}%{_datadir}/%{name}
@@ -150,8 +147,7 @@
 
 %files
 %defattr(0644,root,root,0755)
-# Disable the swing debugger tool script because it uses proprietary code from Sun
-#%attr(0755,root,root) %{_bindir}/*
+%attr(0755,root,root) %{_bindir}/*
 %{_javadir}/*
 
 %files demo
@@ -167,6 +163,9 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Jan 09 2008 Caolan McNamara <caolanm@redhat.com> 0:1.6-0.1.r5.1jpp.3
+- use relicensed swingExSrc.zip replacement from openoffice.org
+
 * Thu Mar 15 2007 Matt Wringe <mwringe@redhat.com> 0:1.6-0.1.r5.1jpp.2
 - Remove script from build as the debugging tool is disabled due to it 
   containing proprietary code from Sun.
--- /dev/null	2007-12-06 18:06:55.610017536 +0000
+++ rhino-1.6r5-useOOoSwingEx.patch	2008-01-09 10:56:51.000000000 +0000
@@ -0,0 +1,56 @@
+--- rhino1_6R5.orig/toolsrc/org/mozilla/javascript/tools/debugger/build.xml	2007-11-29 11:47:10.000000000 +0000
++++ rhino1_6R5/toolsrc/org/mozilla/javascript/tools/debugger/build.xml	2007-11-29 11:47:44.000000000 +0000
+@@ -47,7 +47,6 @@
+          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/">
+       <patternset>
+           <include name="AbstractCellEditor.java"/>
+@@ -57,18 +56,12 @@
+       </patternset>
+     </unzip>
+     <replace file="downloaded/AbstractCellEditor.java">
+-       <replacetoken>import java.awt.Component;</replacetoken>
+-       <replacevalue>
+-         package org.mozilla.javascript.tools.debugger.downloaded;
+-         import java.awt.Component;
+-       </replacevalue>
++       <replacetoken>package org.mozilla.javascript.tools.debugger;</replacetoken>
++       <replacevalue>package org.mozilla.javascript.tools.debugger.downloaded;</replacevalue>
+     </replace>
+     <replace file="downloaded/JTreeTable.java">
+-       <replacetoken>import javax.swing.*;</replacetoken>
+-       <replacevalue>
+-         package org.mozilla.javascript.tools.debugger.downloaded;
+-         import javax.swing.*;
+-       </replacevalue>
++       <replacetoken>package org.mozilla.javascript.tools.debugger;</replacetoken>
++       <replacevalue>package org.mozilla.javascript.tools.debugger.downloaded;</replacevalue>
+     </replace>
+     <replace file="downloaded/JTreeTable.java">
+        <replacetoken>class ListToTreeSelectionModelWrapper</replacetoken>
+@@ -79,18 +72,12 @@
+        <replacevalue>public ListSelectionModel getListSelectionModel</replacevalue>
+     </replace>
+     <replace file="downloaded/TreeTableModel.java">
+-       <replacetoken>import javax.swing.tree.TreeModel;</replacetoken>
+-       <replacevalue>
+-         package org.mozilla.javascript.tools.debugger.downloaded;
+-         import javax.swing.tree.TreeModel;
+-       </replacevalue>
++       <replacetoken>package org.mozilla.javascript.tools.debugger;</replacetoken>
++       <replacevalue>package org.mozilla.javascript.tools.debugger.downloaded;</replacevalue>
+     </replace>
+     <replace file="downloaded/TreeTableModelAdapter.java">
+-       <replacetoken>import javax.swing.JTree;</replacetoken>
+-       <replacevalue>
+-         package org.mozilla.javascript.tools.debugger.downloaded;
+-         import javax.swing.JTree;
+-       </replacevalue>
++       <replacetoken>package org.mozilla.javascript.tools.debugger;</replacetoken>
++       <replacevalue>package org.mozilla.javascript.tools.debugger.downloaded;</replacevalue>
+     </replace>
+     <delete file="downloaded/swingExSrc.zip"/>
+   </target>