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

Remove the APIs tarball too

Browse Source
This commit is contained in:
gbenson 2005-06-14 09:43:46 +00:00
parent eb57581657
commit 21e99fea6a
4 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -1,5 +1,4 @@
Xerces-J-src.2.6.2.tar.gz
xml-commons-external-1.2.01-src.zip
xerces-2_6_2
i386
*.src.rpm

1
sources
View File

@ -1,2 +1 @@
cfd536b8d72f8ebe3465ae35f5e3775d Xerces-J-src.2.6.2.tar.gz
47fda4da12a26e95d3f2273a55d29581 xml-commons-external-1.2.01-src.zip

50
xerces-j2-build.patch
View File

@ -19,16 +19,35 @@
<property name="build.dir" value="./build"/>
<property name="build.src" value="${build.dir}/src"/>
@@ -84,7 +85,7 @@
@@ -84,7 +85,6 @@
<property name="distsrc.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/>
<property name="disttools.dir" value="${build.dir}/tools"/>
<property name="distbin.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/>
- <property name='src.apis.zip' value="${tools.dir}/xml-commons-external-1.2.01-src.zip"/>
+ <property name='src.apis.zip' value="./tools/xml-commons-external-1.2.01-src.zip"/>
<filter token="year" value="${year}"/>
<filter token="version" value="${parser.Version}"/>
@@ -304,7 +305,7 @@
@@ -190,19 +190,6 @@
</fileset>
</copy>
- <!-- now deal with API's: -->
- <unzip src="${src.apis.zip}" dest="${build.src}">
- <patternset
- includes="org/xml/sax/**
- javax/xml/parsers/**
- org/w3c/dom/*
- org/w3c/dom/events/**
- org/w3c/dom/html/**
- org/w3c/dom/ranges/**
- org/w3c/dom/traversal/**"
- />
- </unzip>
-
<!-- substitute tokens as needed -->
<replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
@@ -304,7 +291,7 @@
</copy>
<xjavac srcdir="${build.tests}"
destdir="${build.dest}"
@ -37,7 +56,7 @@
debug="${debug}"
includeAntRuntime="false"
includeJavaRuntime="true"/>
@@ -347,7 +348,7 @@
@@ -347,7 +334,7 @@
<target name="docs" depends="prepare, prepare-docs">
<echo message="Building docs for ${parser.Name} ${parser.Version} ..." />
<java fork="yes"
@ -46,7 +65,28 @@
classname="${doc.generator}"
failOnError="yes">
<arg value="targetDirectory=${build.docs}"/>
@@ -1282,7 +1283,7 @@
@@ -941,20 +928,6 @@
<replace file="${build.dir}/src/org/apache/xerces/dom/AttrNSImpl.java"
token="return ((String)type).getNamespace();" value="return null;"/>
- <!-- now deal with API's: -->
- <unzip src="${src.apis.zip}" dest="${build.src}">
- <patternset
- includes="org/xml/sax/**
- javax/xml/parsers/**
- org/w3c/dom/*
- org/w3c/dom/events/**
- org/w3c/dom/html/**
- org/w3c/dom/ranges/**
- org/w3c/dom/traversal/**"
- />
- </unzip>
-
-
<!-- substitute tokens as needed -->
<replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
@@ -1282,7 +1255,7 @@
<xjavac srcdir="${build.tests}"
destdir="${build.dest}"

6
xerces-j2.spec
View File

@ -16,7 +16,6 @@ Source0: http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.%{version}.tar.gz
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}-libgcj.patch
Provides: jaxp_parser_impl
@ -120,8 +119,6 @@ mkdir -p tools/org/apache/xerces/util
cp -a %{SOURCE3} tools/org/apache/xerces/util
%patch1 -p0 -b .libgcj
cp -a %{SOURCE4} tools
%build
pushd tools
@ -292,6 +289,9 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
%changelog
* Tue Jun 14 2005 Gary Benson <gbenson@redhat.com>
- Remove the APIs tarball too.
* Fri Jun 10 2005 Gary Benson <gbenson@redhat.com> 0:2.6.2-4jpp_8fc
- Remove the tools tarball, and build xjavac from source.
- Replace classpath workaround to xjavac task and use