rpms/xml-commons/devel xml-commons.spec, 1.12, 1.13 xml-commons.bz155693.patch, 1.3, NONE

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/xml-commons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9297

Modified Files:
	xml-commons.spec 
Removed Files:
	xml-commons.bz155693.patch 
Log Message:
Merge in final #155693 fix and build


Index: xml-commons.spec
===================================================================
RCS file: /cvs/dist/rpms/xml-commons/devel/xml-commons.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xml-commons.spec	25 Apr 2005 10:46:36 -0000	1.12
+++ xml-commons.spec	3 May 2005 16:19:43 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:        Common code for XML projects
 Name:           xml-commons
 Version:        1.0
-Release:        0.b2.6jpp_9fc
+Release:        0.b2.6jpp_11fc
 Epoch:          0
 License:        Apache Software License
 URL:            http://xml.apache.org/commons/
@@ -12,10 +12,11 @@
 Patch0:         xml-commons.build.patch
 Patch1:         xml-commons.manifest.patch
 Patch2:         xml-commons.bz130162.patch
-Patch3:         xml-commons.bz155693.patch
 Requires:       jpackage-utils >= 0:1.5
 BuildRequires:  ant, jpackage-utils >= 0:1.5
 BuildRequires:  coreutils
+BuildRequires:  gcc-java >= 4.0.0-0.43
+ExclusiveArch:  i386 x86_64 ppc
 Group:          Text Processing/Markup/XML
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 #Vendor:         JPackage Project
@@ -82,7 +83,6 @@
 if java -version 2>&1 | grep -q "gcj"; then
 %patch2 -p1
 fi
-%patch3 -p1
 
 # -----------------------------------------------------------------------------
 
@@ -122,11 +122,6 @@
   $RPM_BUILD_ROOT%{_javadir}/%{name}-apis-%{version}.jar \
   %{_libdir}/lib%{name}-apis-%{version}.jar.so
 
-# GCJ endorsed dirs support
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
-ln -s %{_javadir}/%{name}-apis-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-apis-%{version}.jar
-
 # Javadocs
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-apis-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-which-%{version}
@@ -156,7 +151,6 @@
 %files apis
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-apis*
-%{_javadir}/gcj-endorsed/%{name}-apis-%{version}.jar
 %attr(0755,root,root) %{_libdir}/lib*.jar.so
 %{_libdir}/*/*/%{name}-%{version}.db
 
@@ -206,9 +200,12 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Mon Apr 25 2005 Gary Benson <gbenson at redhat.com>
+* Tue May  3 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-0.b2.6jpp_11fc
 - BC-compile the API jar.
 
+* Tue Apr 26 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-0.b2.6jpp_10fc
+- Remove gcj endorsed dir support (#155693).
+
 * Mon Apr 25 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-0.b2.6jpp_9fc
 - Provide a default transformer when running under libgcj.
 


--- xml-commons.bz155693.patch DELETED ---