rpms/rhino/F-10 rhino-build.patch,1.1,1.2 rhino.spec,1.4,1.5
Lillian Angel
langel at fedoraproject.org
Thu Mar 26 15:24:03 UTC 2009
Author: langel
Update of /cvs/pkgs/rpms/rhino/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20731
Modified Files:
rhino-build.patch rhino.spec
Log Message:
* Thu Mar 26 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.3.r2pre.1.1
- Updated rhino-build.patch
- License for treetable has been fixed. Re-included this code, and removed patch.
- Resolves: rhbz#457336
rhino-build.patch:
Index: rhino-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rhino/F-10/rhino-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rhino-build.patch 13 Feb 2009 19:51:37 -0000 1.1
+++ rhino-build.patch 26 Mar 2009 15:24:03 -0000 1.2
@@ -92,3 +92,101 @@
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
+@@ -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
+ -->
+- <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"/>
+@@ -56,58 +56,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"/>
Index: rhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhino/F-10/rhino.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rhino.spec 13 Feb 2009 19:51:37 -0000 1.4
+++ rhino.spec 26 Mar 2009 15:24:03 -0000 1.5
@@ -32,25 +32,22 @@
Name: rhino
Version: 1.7
-Release: 0.1.r2pre.1.1%{?dist}
+Release: 0.3.r2pre.1.1%{?dist}
Epoch: 0
Summary: JavaScript for Java
License: MPLv1.1 or GPLv2+
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
+Source2: %{name}.script
-Patch0: %{name}-1.7r2pre-disabledebuggertool.patch
-Patch1: %{name}-build.patch
+Patch0: %{name}-build.patch
URL: http://www.mozilla.org/rhino/
Group: Development/Libraries/Java
BuildRequires: ant
BuildRequires: bea-stax-api
-BuildRequires: java-1.6.0-openjdk-devel >= 1:1.6.0.0
+BuildRequires: java-1.6.0-openjdk-devel >= 1:1.6.0.0
# Disable xmlbeans until we can get it into Fedora
#Requires: xmlbeans
@@ -87,17 +84,11 @@
%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
+%patch0 -p1
# 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
-# Disabled until legality can be sorted out.
-#%{__install} -D -p -m 644 %{SOURCE1} toolsrc/org/mozilla/javascript/tools/debugger/downloaded/swingExSrc.zip
-
# Fix manifest
%{__perl} -pi -e 's|^Class-Path:.*\n||g' src/manifest
@@ -135,10 +126,9 @@
%{__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
-#%__mkdir_p %{buildroot}%{_bindir}
-#%__install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
+%__mkdir_p %{buildroot}%{_bindir}
+%__install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
# examples
%{__mkdir_p} %{buildroot}%{_datadir}/%{name}
@@ -149,8 +139,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
@@ -168,6 +157,14 @@
%doc %{_javadocdir}/*
%changelog
+* Thu Mar 26 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.3.r2pre.1.1
+- Updated rhino-build.patch
+- License for treetable has been fixed. Re-included this code, and removed patch.
+- Resolves: rhbz#457336
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.7-0.2.r2pre.1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Fri Feb 13 2009 Lillian Angel <langel at redhat.com> - 0:1.7-0.1.r2pre.1.1
- Upgraded to 1.7r2pre.
- Resolves: rhbz#485135
More information about the fedora-extras-commits
mailing list