rpms/xerces-j2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Sync with JPackage

Browse Source
This commit is contained in:
gbenson 2005-06-14 09:19:23 +00:00
parent b23bf7c8d4
commit eb57581657
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xerces-j2-build.patch
View File

@ -6,7 +6,7 @@
<!-- enable compilation under IBM JDK 1.4 -->
- <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
+ <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"
+ classpath="./tools/xjavac.jar"/>
+ classpath="./tools/bin/xjavac.jar"/>
<!-- Allow properties following these statements to be overridden -->
<!-- Note that all of these don't have to exist. They've just been defined

17
xerces-j2-libgcj.patch Normal file
View File

@ -0,0 +1,17 @@
Also apply the xjavac classpath hack when running under libgcj.
http://issues.apache.org/bugzilla/show_bug.cgi?id=34551
http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=152255
--- tools/org/apache/xerces/util/XJavac.java~ 2005-06-10 10:18:47 +0100
+++ tools/org/apache/xerces/util/XJavac.java 2005-06-10 11:14:35 +0100
@@ -97,7 +97,8 @@
else if( (vendor.indexOf("SUN") >= 0) ||
(vendor.indexOf("BLACKDOWN") >= 0) ||
(vendor.indexOf("APPLE") >= 0) ||
- (vendor.indexOf("HEWLETT-PACKARD") >= 0)) {
+ (vendor.indexOf("HEWLETT-PACKARD") >= 0) ||
+ (vendor.indexOf("FREE SOFTWARE FOUNDATION") >= 0)) {
// we're on an SUN 1.4; fiddle with the bootclasspath.
// since we can't eviscerate XML-related info here,
// we must use the classpath

10
xerces-j2.spec
View File

@ -17,8 +17,8 @@ Source1: %{name}-version.sh
Source2: %{name}-constants.sh
Source3: XJavac.java
Source4: xml-commons-external-1.2.01-src.zip
Patch0: %{name}-build.patch
Patch1: %{name}-bz152255.patch
Patch0: %{name}-build.patch
Patch1: %{name}-libgcj.patch
Provides: jaxp_parser_impl
Requires: xml-commons-apis
Requires: xml-commons-resolver
@ -118,15 +118,15 @@ Additional utility scripts for %{name}.
mkdir -p tools/org/apache/xerces/util
cp -a %{SOURCE3} tools/org/apache/xerces/util
%patch1 -p0 -b .bz152255
%patch1 -p0 -b .libgcj
cp -a %{SOURCE4} tools
%build
pushd tools
find -name '*.java' | xargs javac -cp $(build-classpath ant)
find -name '*.class' | xargs jar cf xjavac.jar
javac -cp $(build-classpath ant) org/apache/xerces/util/XJavac.java
mkdir bin && jar cf bin/xjavac.jar org/apache/xerces/util/XJavac.class
popd
unset CLASSPATH