[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/xerces-j2/devel xerces-j2-libgcj.patch, NONE, 1.1 xerces-j2-build.patch, 1.4, 1.5 xerces-j2.spec, 1.27, 1.28 xerces-j2-bz152255.patch, 1.3, NONE



Author: gbenson

Update of /cvs/dist/rpms/xerces-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11387

Modified Files:
	xerces-j2-build.patch xerces-j2.spec 
Added Files:
	xerces-j2-libgcj.patch 
Removed Files:
	xerces-j2-bz152255.patch 
Log Message:
Sync with JPackage

xerces-j2-libgcj.patch:
 XJavac.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE xerces-j2-libgcj.patch ---
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

xerces-j2-build.patch:
 build.xml |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

Index: xerces-j2-build.patch
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2-build.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xerces-j2-build.patch	10 Jun 2005 09:53:42 -0000	1.4
+++ xerces-j2-build.patch	14 Jun 2005 09:19:23 -0000	1.5
@@ -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


Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xerces-j2.spec	10 Jun 2005 10:37:21 -0000	1.27
+++ xerces-j2.spec	14 Jun 2005 09:19:23 -0000	1.28
@@ -17,8 +17,8 @@
 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 @@
 
 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


--- xerces-j2-bz152255.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]