Pick up #152255 changes and nativify

This commit is contained in:
gbenson 2005-04-29 12:55:01 +00:00
parent 5da954cdc0
commit f66dfcf54a

View File

@ -1,7 +1,7 @@
%define name xerces-j2
%define version 2.6.2
%define cvs_version 2_6_2
%define release 4jpp_2fc
%define release 4jpp_4fc
%define section free
Name: %{name}
@ -12,14 +12,12 @@ Summary: Java XML parser
License: Apache Software License
URL: http://xml.apache.org/xerces2-j/
Group: Text Processing/Markup/XML
#Vendor: JPackage Project
#Distribution: JPackage
Source0: http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.%{version}.tar.gz
Source1: %{name}-version.sh
Source2: %{name}-constants.sh
Source3: http://archive.apache.org/dist/xml/xerces-j/Xerces-J-tools.%{version}.tar.gz
Source4: XJavac.java
Patch0: %{name}-build.patch
Patch1: %{name}-bz152255.patch
Provides: jaxp_parser_impl
Requires: xml-commons-apis
Requires: xml-commons-resolver
@ -31,6 +29,8 @@ BuildRequires: jaxp_parser_impl
BuildRequires: xml-commons-resolver
BuildRequires: xml-commons-apis
BuildRequires: coreutils
BuildRequires: gcc-java >= 4.0.0-0.43
ExclusiveArch: i386 x86_64 ppc
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
# RHEL3 and FC2
Obsoletes: xerces-j <= 0:2.2
@ -112,20 +112,13 @@ Additional utility scripts for %{name}.
%setup -q -n xerces-%{cvs_version}
%setup -q -T -a 3 -D -n xerces-%{cvs_version}
%setup -T -D -n xerces-%{cvs_version}
rm -f tools/bin/xjavac.jar
%patch0 -p1 -b .build
%patch1 -p1 -b .bz152255
# clean jar files
find -name "*.jar" | sed '/\/xjavac\.jar$/d' | xargs rm -f
%build
mkdir -p org/apache/xerces/util
cp $RPM_SOURCE_DIR/XJavac.java org/apache/xerces/util
javac \
-classpath $(%{_bindir}/build-classpath ant) \
org/apache/xerces/util/XJavac.java
jar cf tools/bin/xjavac.jar org/apache/xerces/util/*.class
rm -rf org
unset CLASSPATH
ant \
-Dbuild.compiler=modern \
@ -134,7 +127,10 @@ ant \
-Djar.resolver=xml-commons-resolver.jar \
clean jars javadocs
aot-compile build/xercesImpl.jar build/lib%{name}.jar.so
aot-compile \
build/xercesImpl.jar \
build/lib%{name}.jar.so \
"$RPM_OPT_FLAGS -fPIC"
%install
rm -rf $RPM_BUILD_ROOT
@ -284,9 +280,13 @@ rebuild-gcj-db %{_libdir}
%changelog
* Thu Apr 21 2005 Gary Benson <gbenson at redhat.com>
* Fri Apr 29 2005 Gary Benson <gbenson at redhat.com> 0:2.6.2-4jpp_4fc
- BC-compile.
* Thu Apr 28 2005 Gary Benson <gbenson at redhat.com> 0:2.6.2-4jpp_3fc
- Revert xjavac classpath workaround, and patch to use libgcj's
classes instead of those in xml-commons (#152255).
* Thu Apr 21 2005 Gary Benson <gbenson at redhat.com> 0:2.6.2-4jpp_2fc
- Add classpath workaround to xjavac task (#152255).