commit b91da8f49e34b3d3a4caa79f0e9abba55ef9e4f0
Author: Matěj Cepl <mcepl at redhat.com>
Date: Wed Sep 21 01:40:37 2011 +0200
Remove bea-stax-api (and perl) dependency
See attached (applies on the top of the current Rawhide build). I
don't think we need to require bea-stax-api which is now part of
OpenJDK.
And now, we don't have to use perl, when we have sed ;)
rhino.spec | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/rhino.spec b/rhino.spec
index 6d36964..e21a22c 100644
--- a/rhino.spec
+++ b/rhino.spec
@@ -35,7 +35,7 @@ Name: rhino
# of Javascript version 1.7 (which is independent from this particular implementation,
# e.g., there is C++ implementation in Spidermonkey)
Version: 1.7R3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: JavaScript for Java
License: MPLv1.1 or GPLv2+
@@ -53,7 +53,6 @@ URL: http://www.mozilla.org/rhino/
Group: Development/Libraries
BuildRequires: ant
-BuildRequires: bea-stax-api
BuildRequires: java-1.6.0-openjdk-devel >= 1:1.6.0.0
Requires: jpackage-utils
Requires: jline
@@ -97,19 +96,19 @@ Javadoc for %{name}.
%patch1 -p1 -b .fixManifest
# 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
+sed -i -e '/.*<get.*src=.*>$/d' build.xml testsrc/build.xml \
+ toolsrc/org/mozilla/javascript/tools/debugger/build.xml xmlimplsrc/build.xml
# Fix manifest
-%{__perl} -pi -e 's|^Class-Path:.*\n||g' src/manifest
+sed -i -e '/^Class-Path:.*$/d' src/manifest
# Add jpp release info to version
-%{__perl} -pi -e 's|^implementation.version: Rhino .* release .* \${implementation.date}|implementation.version: Rhino %{version} release %{release} \${implementation.date}|' build.properties
+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 -Dxbean.jar=$(build-classpath xmlbeans/xbean) \
- -Djsr173.jar=$(build-classpath bea-stax-api) deepclean jar copy-all javadoc
+%ant deepclean jar copy-all javadoc -Dno-xmlbeans=1
pushd examples
@@ -165,6 +164,9 @@ cp -a examples/* %{buildroot}%{_datadir}/%{name}
%doc %{_javadocdir}/*
%changelog
+* Wed Sep 21 2011 Matěj Cepl <mcepl at redhat.com> - 1.7R3-2
+- Remove bea-stax-api dependency (and perl as well)
+
* Fri Sep 16 2011 Matěj Cepl <mcepl at redhat.com> - 1.7R3-1
- Fix numbering of the package (this is not a prerelease)
- Remove unnecessary macros