Sync with RHAPS

This commit is contained in:
gbenson 2005-01-12 10:21:36 +00:00
parent a4b5881447
commit 9d8885d531

View File

@ -1,7 +1,7 @@
%define name xerces-j2 %define name xerces-j2
%define version 2.6.2 %define version 2.6.2
%define cvs_version 2_6_2 %define cvs_version 2_6_2
%define release 2jpp_5fc %define release 4jpp_1fc
%define section free %define section free
Name: %{name} Name: %{name}
@ -14,21 +14,22 @@ URL: http://xml.apache.org/xerces2-j/
Group: Text Processing/Markup/XML Group: Text Processing/Markup/XML
#Vendor: JPackage Project #Vendor: JPackage Project
#Distribution: JPackage #Distribution: JPackage
Source0: http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.2.6.2.tar.gz Source0: http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.%{version}.tar.gz
Source1: http://www.apache.org/dist/xml/xerces-j/Xerces-J-tools.2.6.2.tar.gz Source1: %{name}-version.sh
Source2: %{name}-version.sh Source2: %{name}-constants.sh
Source3: %{name}-constants.sh Source3: http://archive.apache.org/dist/xml/xerces-j/Xerces-J-tools.%{version}.tar.gz
Patch0: xerces-j2-2.6.2-build.patch Patch0: %{name}-build.patch
Patch1: xerces-j2-2.6.2-nonjikes-cast.patch
Provides: jaxp_parser_impl Provides: jaxp_parser_impl
Requires: xml-commons-apis Requires: xml-commons-apis
Requires: xml-commons-resolver
Requires: /usr/sbin/update-alternatives Requires: /usr/sbin/update-alternatives
BuildRequires: ant >= 0:1.5 BuildRequires: ant >= 0:1.5
BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: jpackage-utils >= 0:1.5
#BuildRequires: jikes
BuildRequires: jaxp_parser_impl BuildRequires: jaxp_parser_impl
BuildRequires: xml-commons-resolver BuildRequires: xml-commons-resolver
# adding build requirement for xml-commons-apis
BuildRequires: xml-commons-apis BuildRequires: xml-commons-apis
BuildRequires: coreutils
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
# RHEL3 and FC2 # RHEL3 and FC2
@ -108,24 +109,17 @@ Additional utility scripts for %{name}.
%prep %prep
%setup -n xerces-%{cvs_version} %setup -q -n xerces-%{cvs_version}
# Inserting the tools directory in the result from the above command %setup -q -T -a 3 -D -n xerces-%{cvs_version}
%setup -T -D -a 1 -n xerces-%{cvs_version} %setup -T -D -n xerces-%{cvs_version}
%patch0 -p0
%patch1 -p0 %patch0 -p1 -b .build
# Delete stuff that doesn't work with libgcj (#130006).
if java -version 2>&1 | grep -q "gcj"; then
rm -f samples/dom/traversal/IteratorView.java
rm -f samples/dom/traversal/TreeWalkerView.java
rm -f samples/ui/DOMTreeFull.java
rm -f samples/ui/DOMTree.java
rm -f samples/ui/TreeView.java
rm -f samples/ui/TreeViewer.java
fi
%build %build
unset CLASSPATH unset CLASSPATH
ant \ ant \
-Dbuild.compiler=modern \
-Dtools.dir=%{_javadir} \ -Dtools.dir=%{_javadir} \
-Djar.apis=xml-commons-apis.jar \ -Djar.apis=xml-commons-apis.jar \
-Djar.resolver=xml-commons-resolver.jar \ -Djar.resolver=xml-commons-resolver.jar \
@ -262,15 +256,33 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
%changelog %changelog
* Wed Jan 12 2005 Gary Benson <gbenson@redhat.com> 0:2.6.2-4jpp_1fc
- Reenable building of classes that require javax.swing (#130006).
- Sync with RHAPS.
* Mon Nov 15 2004 Fernando Nasser <fnasser@redhat.com> 0:2.6.2-4jpp_1rh
- Merge with upstream for 2.6.2 upgrade
* Thu Nov 4 2004 Gary Benson <gbenson@redhat.com> 0:2.6.2-2jpp_5fc * Thu Nov 4 2004 Gary Benson <gbenson@redhat.com> 0:2.6.2-2jpp_5fc
- Build into Fedora. - Build into Fedora.
* Thu Oct 28 2004 Gary Benson <gbenson@redhat.com> 0:2.6.2-2jpp_4fc * Thu Oct 28 2004 Gary Benson <gbenson@redhat.com> 0:2.6.2-2jpp_4fc
- Bootstrap into Fedora. - Bootstrap into Fedora.
* Fri Oct 1 2004 Andrew Overholt <overholt@redhat.com> 0:2.6.2-2jpp_4rh
- add coreutils BuildRequires
* Thu Sep 30 2004 Andrew Overholt <overholt@redhat.com> 0:2.6.2-2jpp_3rh * Thu Sep 30 2004 Andrew Overholt <overholt@redhat.com> 0:2.6.2-2jpp_3rh
- Remove xml-commons-resolver as a Requires - Remove xml-commons-resolver as a Requires
* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> 0:2.6.2-4jpp
- Build with ant-1.6.2
- Dropped jikes requirement, built for 1.4.2
* Wed Jun 23 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:2.6.2-3jpp
- Updated Patch #0 to fix breakage using BEA 1.4.2 SDK, new patch
from <mwringe@redhat.com> and <vivekl@redhat.com>.
* Mon Jun 21 2004 Vivek Lakshmanan <vivekl@redhat.com> 0:2.6.2-2jpp_2rh * Mon Jun 21 2004 Vivek Lakshmanan <vivekl@redhat.com> 0:2.6.2-2jpp_2rh
- Added new Source1 URL and added new %setup to expand it under the - Added new Source1 URL and added new %setup to expand it under the
expanded result of Source0. expanded result of Source0.
@ -281,9 +293,15 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
- Update to 2.6.2 - Update to 2.6.2
- made patch names comformant - made patch names comformant
* Mon Mar 29 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:2.6.2-2jpp
- Rebuilt with jikes 1.18 for java 1.3.1_11
* Fri Mar 26 2004 Frank Ch. Eigler <fche@redhat.com> 0:2.6.1-1jpp_2rh * Fri Mar 26 2004 Frank Ch. Eigler <fche@redhat.com> 0:2.6.1-1jpp_2rh
- add RHUG upgrade cleanup - add RHUG upgrade cleanup
* Tue Mar 23 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:2.6.2-1jpp
- 2.6.2
* Thu Mar 11 2004 Frank Ch. Eigler <fche@redhat.com> 0:2.6.1-1jpp_1rh * Thu Mar 11 2004 Frank Ch. Eigler <fche@redhat.com> 0:2.6.1-1jpp_1rh
- RH vacuuming - RH vacuuming
- remove jikes dependency - remove jikes dependency