From e8fb8c60cc0a08dcbb63d1c65b5c5a91fb4caa4d Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Jul 07 2011 14:37:19 +0000 Subject: Add patch to inject OSGi metadata from Eclipse Orbit project --- diff --git a/rhino-addOrbitManifest.patch b/rhino-addOrbitManifest.patch new file mode 100644 index 0000000..d697522 --- /dev/null +++ b/rhino-addOrbitManifest.patch @@ -0,0 +1,34 @@ +--- src/manifest 2009-03-22 14:32:24.000000000 -0400 ++++ src/manifest 2011-07-07 10:29:37.524424552 -0400 +@@ -1,2 +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-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 ++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 ++ xp,org.mozilla.javascript.serialize,org.mozilla.javascript.tools,org. ++ mozilla.javascript.tools.debugger,org.mozilla.javascript.tools.debugg ++ er.treetable,org.mozilla.javascript.tools.idswitch,org.mozilla.javasc ++ ript.tools.jsc,org.mozilla.javascript.tools.shell,org.mozilla.javascr ++ ipt.xml,org.mozilla.javascript.xml.impl.xmlbeans,org.mozilla.javascri ++ pt.xmlimpl ++Bundle-ManifestVersion: 2 ++Import-Package: javax.swing;resolution:=optional,javax.swing.border;re ++ solution:=optional,javax.swing.event;resolution:=optional,javax.swing ++ .filechooser;resolution:=optional,javax.swing.table;resolution:=optio ++ nal,javax.swing.text;resolution:=optional,javax.swing.tree;resolution ++ :=optional,javax.xml.namespace;resolution:=optional,javax.xml.parsers ++ ;resolution:=optional,javax.xml.transform;resolution:=optional,javax. ++ xml.transform.dom;resolution:=optional,javax.xml.transform.stream;res ++ olution:=optional,org.w3c.dom;resolution:=optional,org.xml.sax;resolu ++ tion:=optional diff --git a/rhino.spec b/rhino.spec index d598ba3..0cc5645 100644 --- a/rhino.spec +++ b/rhino.spec @@ -32,7 +32,7 @@ Name: rhino Version: 1.7 -Release: 0.8.r2%{?dist} +Release: 0.9.r2%{?dist} Epoch: 0 Summary: JavaScript for Java License: MPLv1.1 or GPLv2+ @@ -44,6 +44,11 @@ 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 + URL: http://www.mozilla.org/rhino/ Group: Development/Libraries/Java @@ -90,6 +95,7 @@ Javadoc for %{name}. %setup -q -n %{name}%{cvs_version} %patch0 -p1 %patch1 -p0 -b .jline +%patch2 # Fix build %{__perl} -pi -e 's|.*\n||' build.xml testsrc/build.xml toolsrc/org/mozilla/javascript/tools/debugger/build.xml xmlimplsrc/build.xml @@ -162,6 +168,9 @@ popd %doc %{_javadocdir}/* %changelog +* Wed Jul 6 2011 Andrew Overholt 0:1.7-0.9.r2 +- Inject OSGi metadata from Eclipse Orbit project. + * Wed Feb 09 2011 Fedora Release Engineering - 0:1.7-0.8.r2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild