[rhino] Update to 1.7R4.
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Feb 26 10:12:01 UTC 2013
commit f84e1691e753e6a2afabba77fed777fbbe0280b3
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Tue Feb 26 12:11:55 2013 +0200
Update to 1.7R4.
rhino-1.7R4.pom | 34 ++++++++++++++++++++
rhino-1.7r2pre-disabledebuggertool.patch | 11 -------
rhino-457336.diff | 32 -------------------
rhino-addOrbitManifest.patch | 8 ++--
rhino.spec | 49 +++++++++++-------------------
sources | 3 +-
6 files changed, 57 insertions(+), 80 deletions(-)
---
diff --git a/rhino-1.7R4.pom b/rhino-1.7R4.pom
new file mode 100644
index 0000000..c7ec588
--- /dev/null
+++ b/rhino-1.7R4.pom
@@ -0,0 +1,34 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.mozilla</groupId>
+ <artifactId>rhino</artifactId>
+ <name>Mozilla Rhino</name>
+ <version>1.7R4</version>
+ <packaging>jar</packaging>
+ <description>Rhino is an open-source implementation of JavaScript written entirely in Java. It is typically embedded into Java applications to provide scripting to end users.</description>
+ <url>https://developer.mozilla.org/en/Rhino</url>
+
+ <licenses>
+ <license>
+ <name>Mozilla Public License, Version 2.0</name>
+ <url>http://www.mozilla.org/MPL/2.0/index.txt</url>
+ </license>
+ </licenses>
+
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <scm>
+ <connection>scm:git:git at github.com:mozilla/rhino.git</connection>
+ <developerConnection>scm:git:git at github.com:mozilla/rhino.git</developerConnection>
+ <url>git at github.com:mozilla/rhino.git</url>
+ </scm>
+
+ <organization>
+ <name>The Mozilla Foundation</name>
+ <url>http://www.mozilla.org</url>
+ </organization>
+</project>
diff --git a/rhino-addOrbitManifest.patch b/rhino-addOrbitManifest.patch
index b58186f..0179c29 100644
--- a/rhino-addOrbitManifest.patch
+++ b/rhino-addOrbitManifest.patch
@@ -4,10 +4,10 @@ diff -up rhino1_7R3/src/manifest.fixManifest rhino1_7R3/src/manifest
@@ -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-Version: 1.7R3
-+Implementation-Title: Mozilla Rhino 1.7R3
+-Implementation-Version: 1.7R4
+-Implementation-Title: Mozilla Rhino 1.7R4
++Implementation-Version: 1.7R4
++Implementation-Title: Mozilla Rhino 1.7R4
Implementation-Vendor: Mozilla Foundation
-Implementation-URL: http://www.mozilla.org/rhino
\ Chybí znak konce řádku na konci souboru
diff --git a/rhino.spec b/rhino.spec
index f993a68..4436dca 100644
--- a/rhino.spec
+++ b/rhino.spec
@@ -28,19 +28,19 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define cvs_version 1_7R3
+%define scm_version 1_7R4
Name: rhino
# R3 doesn't mean a prerelease, but behind R there is a version of this implementation
# of Javascript version 1.7 (which is independent from this particular implementation,
# e.g., there is C++ implementation in Spidermonkey)
-Version: 1.7R3
-Release: 8%{?dist}
+Version: 1.7R4
+Release: 1%{?dist}
Summary: JavaScript for Java
-License: MPLv1.1 or GPLv2+
+License: MPLv2.0
-Source0: ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{cvs_version}.zip
-Source1: http://repo1.maven.org/maven2/%{name}/js/1.7R2/js-1.7R2.pom
+Source0: https://github.com/mozilla/rhino/archive/Rhino%{scm_version}_RELEASE.zip
+Source1: http://repo1.maven.org/maven2/org/mozilla/rhino/%{version}/rhino-%{version}.pom
Source2: %{name}.script
Patch0: %{name}-build.patch
@@ -54,7 +54,7 @@ URL: http://www.mozilla.org/rhino/
Group: Development/Libraries
BuildRequires: ant
-BuildRequires: java-1.7.0-openjdk-devel >= 1:1.6.0.0
+BuildRequires: java-devel >= 1:1.6.0.0
Requires: jpackage-utils
Requires: jline
@@ -62,7 +62,6 @@ Requires: jline
#Requires: xmlbeans
#BuildRequires: xmlbeans
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Rhino is an open-source implementation of JavaScript written entirely
@@ -94,7 +93,7 @@ Requires: java-javadoc
Javadoc for %{name}.
%prep
-%setup -q -n %{name}%{cvs_version}
+%setup -q -n %{name}-Rhino%{scm_version}_RELEASE
%patch0 -p1 -b .build
%patch1 -p1 -b .fixManifest
%patch2 -p1 -b .crosslink
@@ -110,29 +109,25 @@ sed -i -e '/^Class-Path:.*$/d' src/manifest
sed -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date}|implementation.version: Rhino %{version} release %{release} \${implementation.date}|' build.properties
%build
-export CLASSPATH=
-export OPT_JAR_LIST=:
-%ant deepclean jar copy-all javadoc -Dno-xmlbeans=1
+ant deepclean jar copy-all javadoc -Dno-xmlbeans=1
pushd examples
-export CLASSPATH=../build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
+export CLASSPATH=../build/%{name}%{scm_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
%{javac} *.java
-%{jar} cvf ../build/%{name}%{cvs_version}/%{name}-examples.jar *.class
+%{jar} cvf ../build/%{name}%{scm_version}/%{name}-examples.jar *.class
popd
%install
-rm -rf %{buildroot}
-
# jars
mkdir -p %{buildroot}%{_javadir}
-cp -a build/%{name}%{cvs_version}/js.jar %{buildroot}%{_javadir}
+cp -a build/%{name}%{scm_version}/js.jar %{buildroot}%{_javadir}
ln -s js.jar %{buildroot}%{_javadir}/%{name}.jar
-cp -a build/%{name}%{cvs_version}/%{name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar
+cp -a build/%{name}%{scm_version}/%{name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar
# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -a build/%{name}%{cvs_version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+cp -a build/%{name}%{scm_version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}
## script
mkdir -p %{buildroot}%{_bindir}
@@ -148,14 +143,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
-%clean
-%__rm -rf %{buildroot}
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-18
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-%__rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
%files
%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/*
@@ -164,20 +151,20 @@ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%files demo
-%defattr(0644,root,root,0755)
%{_datadir}/%{name}
%files manual
-%defattr(0644,root,root,0755)
%if 0
-%doc build/%{name}%{cvs_version}/docs/*
+%doc build/%{name}%{scm_version}/docs/*
%endif
%files javadoc
-%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Feb 26 2013 Alexander Kurtakov <akurtako at redhat.com> 1.7R4-1
+- Update to 1.7R4.
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7R3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index c8af857..62172e2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-99d94103662a8d0b571e247a77432ac5 rhino1_7R3.zip
-d01613cef43395942ea771db748dbb7d js-1.7R2.pom
+78f23784a07cde25995088037e025e48 Rhino1_7R4_RELEASE.zip
More information about the scm-commits
mailing list