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

Updated to 2.7.1

Browse Source
This commit is contained in:
rafaels 2006-02-22 23:24:57 +00:00
parent c5cc783562
commit db8ccf8dbe
4 changed files with 34 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.cvsignore
View File

@ -1,4 +1 @@
Xerces-J-src.2.6.2.tar.gz
xerces-2_6_2
i386
*.src.rpm
Xerces-J-src.2.7.1.tar.gz

2
sources
View File

@ -1 +1 @@
cfd536b8d72f8ebe3465ae35f5e3775d Xerces-J-src.2.6.2.tar.gz
487701cad13bcf87cec21ed2d782ca45 Xerces-J-src.2.7.1.tar.gz

47
xerces-j2-build.patch
View File

@ -1,5 +1,5 @@
--- xerces-2_6_2/build.xml.old 2004-06-23 22:51:24.713522228 +0300
+++ xerces-2_6_2/build.xml 2004-06-23 22:51:30.820838826 +0300
--- build.xml.orig 2005-06-25 16:25:27.000000000 -0400
+++ build.xml 2005-07-26 19:46:47.000000000 -0400
@@ -19,7 +19,8 @@
<project default="usage" basedir=".">
@ -10,7 +10,7 @@
<!-- Allow properties following these statements to be overridden -->
<!-- Note that all of these don't have to exist. They've just been defined
@@ -70,7 +71,7 @@
@@ -69,7 +70,7 @@
<property name="packages" value="org.*"/>
<property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
@ -19,35 +19,43 @@
<property name="build.dir" value="./build"/>
<property name="build.src" value="${build.dir}/src"/>
@@ -84,7 +85,6 @@
@@ -83,7 +84,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.dir}/xml-commons-external-src.zip"/>
<filter token="year" value="${year}"/>
<filter token="version" value="${parser.Version}"/>
@@ -190,19 +190,6 @@
@@ -195,27 +195,6 @@
javax.xml.parsers.ConvertToURI.java">
</fileset>
</copy>
-
- <!-- now deal with API's: -->
- <unzip src="${src.apis.zip}" dest="${build.src}">
- <patternset
- includes="org/xml/sax/**
- javax/xml/**
- javax/xml/datatype/**
- javax/xml/namespace/**
- javax/xml/parsers/**
- javax/xml/transform/**
- javax/xml/validation/**
- javax/xml/xpath/**
- org/w3c/dom/*
- org/w3c/dom/events/**
- org/w3c/dom/html/**
- org/w3c/dom/ls/**
- org/w3c/dom/ranges/**
- org/w3c/dom/traversal/**"
- org/w3c/dom/traversal/**
- org/w3c/dom/xpath/**"
- />
- </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 @@
@@ -311,7 +290,7 @@
</copy>
<xjavac srcdir="${build.tests}"
destdir="${build.dest}"
@ -56,7 +64,7 @@
debug="${debug}"
includeAntRuntime="false"
includeJavaRuntime="true"/>
@@ -347,7 +334,7 @@
@@ -354,7 +333,7 @@
<target name="docs" depends="prepare, prepare-docs">
<echo message="Building docs for ${parser.Name} ${parser.Version} ..." />
<java fork="yes"
@ -65,9 +73,9 @@
classname="${doc.generator}"
failOnError="yes">
<arg value="targetDirectory=${build.docs}"/>
@@ -941,20 +928,6 @@
<replace file="${build.dir}/src/org/apache/xerces/dom/AttrNSImpl.java"
token="return ((String)type).getNamespace();" value="return null;"/>
@@ -997,20 +976,6 @@
<replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"
token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>
- <!-- now deal with API's: -->
- <unzip src="${src.apis.zip}" dest="${build.src}">
@ -86,12 +94,3 @@
<!-- 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}"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes:./tools/junit.jar"
+ classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes:${tools.dir}/junit.jar"
debug="${debug}"
includeAntRuntime="false"
includeJavaRuntime="true"/>

36
xerces-j2.spec
View File

@ -1,7 +1,7 @@
%define name xerces-j2
%define version 2.6.2
%define cvs_version 2_6_2
%define release 6jpp_5fc
%define version 2.7.1
%define cvs_version 2_7_1
%define release 6jpp_6fc
%define section free
Name: %{name}
@ -20,13 +20,13 @@ Patch0: %{name}-build.patch
Patch1: %{name}-libgcj.patch
Provides: jaxp_parser_impl
Requires: xml-commons-apis
Requires: xml-commons-resolver
Requires: xml-commons-resolver >= 1.1
Requires: /usr/sbin/update-alternatives
BuildRequires: java-devel
BuildRequires: ant >= 0:1.5
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: jaxp_parser_impl
BuildRequires: xml-commons-resolver
BuildRequires: xml-commons-resolver >= 0:1.1
BuildRequires: xml-commons-apis
BuildRequires: coreutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@ -71,13 +71,6 @@ Group: Development/Documentation
%description javadoc-apis
Javadoc for %{name} apis.
%package javadoc-dom3
Summary: Javadoc for %{name} DOM3
Group: Development/Documentation
%description javadoc-dom3
Javadoc for %{name} DOM3.
%package javadoc-xni
Summary: Javadoc for %{name} xni
Group: Development/Documentation
@ -114,7 +107,7 @@ Additional utility scripts for %{name}.
%prep
%setup -q -n xerces-%{cvs_version}
%patch0 -p1 -b .build
%patch0 -p0 -b .build
mkdir -p tools/org/apache/xerces/util
cp -a %{SOURCE3} tools/org/apache/xerces/util
@ -161,11 +154,6 @@ cp -pr build/docs/javadocs/xni/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-xni-%{version}
ln -s %{name}-xni-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-xni
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-dom3-%{version}
cp -pr build/docs/javadocs/dom3-api/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-dom3-%{version}
ln -s %{name}-dom3-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-dom3
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-other-%{version}
cp -pr build/docs/javadocs/other/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-other-%{version}
@ -201,10 +189,6 @@ rm -f %{_javadir}/xerces.jar
rm -f %{_javadocdir}/%{name}-apis
ln -s %{name}-apis-%{version} %{_javadocdir}/%{name}-apis
%post javadoc-dom3
rm -f %{_javadocdir}/%{name}-dom3
ln -s %{name}-dom3-%{version} %{_javadocdir}/%{name}-dom3
%post javadoc-impl
rm -f %{_javadocdir}/%{name}-impl
ln -s %{name}-impl-%{version} %{_javadocdir}/%{name}-impl
@ -255,11 +239,6 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
%doc %{_javadocdir}/%{name}-apis-%{version}
%ghost %doc %{_javadocdir}/%{name}-apis
%files javadoc-dom3
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-dom3-%{version}
%ghost %doc %{_javadocdir}/%{name}-dom3
%files javadoc-other
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-other-%{version}
@ -281,6 +260,9 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
%changelog
* Wed Feb 22 2006 Rafael Schloming <rafaels@redhat.com> - 0:2.7.1-6jpp_6fc
- Updated to 2.7.1
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0:2.6.2-6jpp_5fc
- bump again for double-long bug on ppc(64)