rpms/xalan-j2/devel xalan-j2-javadoc.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.4, 1.5 xalan-j2.spec, 1.30, 1.31

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/xalan-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19328

Modified Files:
	.cvsignore sources xalan-j2.spec 
Added Files:
	xalan-j2-javadoc.patch 
Log Message:
Fix demo subpackage's dependencies and remove a tarball from the tarball

xalan-j2-javadoc.patch:
 build.xml |   12 ------------
 1 files changed, 12 deletions(-)

--- NEW FILE xalan-j2-javadoc.patch ---
--- xalan-j_2_6_0/build.xml~	2005-06-15 11:30:18.000000000 +0100
+++ xalan-j_2_6_0/build.xml	2005-06-28 10:21:35.000000000 +0100
@@ -873,12 +873,6 @@
 
   <target name="autojavadocs-1.4">
     
-      <!-- Expand xml-commons sources (JAXP 1.1, DOM 2, and SAX 2) into source tree for 
-           inclusion in the Javadoc. -->                                            
-     <gunzip src="${xml-commons-srcs.tar.gz}" dest="${build.dir}" />                                                                         
-     <untar src="${xml-commons-srcs.tar}" dest="${src.dir}" /><!-- Note this is into the src area.-->                                                                         
-     <delete file="${xml-commons-srcs.tar}"/>
-      
     <!-- Ant ignores destdir arg if doclet is set, so must send to doclet in doclet subelement-->
     <javadoc
          additionalparam="-breakiterator"
@@ -925,12 +919,6 @@
   </target>
   <target name="autojavadocs-non1.4">
     
-      <!-- Expand xml-commons sources (JAXP 1.1, DOM 2, and SAX 2) into source tree for 
-           inclusion in the Javadoc. -->                                            
-     <gunzip src="${xml-commons-srcs.tar.gz}" dest="${build.dir}" />                                                                         
-     <untar src="${xml-commons-srcs.tar}" dest="${src.dir}" /><!-- Note this is into the src area.-->                                                                         
-     <delete file="${xml-commons-srcs.tar}"/>
-      
     <!-- Ant ignores destdir arg if doclet is set, so must send to doclet in doclet subelement-->
     <javadoc
          public="true"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Jun 2005 10:54:29 -0000	1.6
+++ .cvsignore	28 Jun 2005 09:33:38 -0000	1.7
@@ -1,4 +1,4 @@
-xalan-j_2_6_0-src-RHCLEAN.tar.bz2
+xalan-j_2_6_0-src-RHsemiCLEAN.tar.bz2
 xalan-j_2_6_0
 i386
 *.src.rpm


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jun 2005 10:54:29 -0000	1.4
+++ sources	28 Jun 2005 09:33:38 -0000	1.5
@@ -1 +1 @@
-1308f13a9b5edeb545d8bde449397245  xalan-j_2_6_0-src-RHCLEAN.tar.bz2
+ed5d8bdfcac79989486ee418abe51f80  xalan-j_2_6_0-src-RHsemiCLEAN.tar.bz2


Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xalan-j2.spec	27 Jun 2005 13:13:02 -0000	1.30
+++ xalan-j2.spec	28 Jun 2005 09:33:38 -0000	1.31
@@ -4,15 +4,16 @@
 
 Name:           xalan-j2
 Version:        %{version}
-Release:        3jpp_1fc
+Release:        3jpp_2fc
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
-Source0:        xalan-j_%{cvs_version}-src-RHCLEAN.tar.bz2
+Source0:        xalan-j_%{cvs_version}-src-RHsemiCLEAN.tar.bz2
 Patch0:         %{name}-noxsltcdeps.patch
 Patch1:         %{name}-manifest.patch
 Patch2:         %{name}-crosslink.patch
 Patch4:         %{name}-bz152255.patch
+Patch5:         %{name}-javadoc.patch
 URL:            http://xml.apache.org/xalan-j/
 Group:          Text Processing/Markup/XML
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -65,8 +66,8 @@
 %package        demo
 Summary:        Demo for %{name}
 Group:          Text Processing/Markup/XML
-Requires:       %{name} = %{epoch}:%{version}-%{release}, servlet
-BuildRequires:  servlet
+Requires:       %{name} = %{epoch}:%{version}-%{release}, servletapi5
+BuildRequires:  servletapi5
 
 %description    demo
 Demonstrations and samples for %{name}.
@@ -76,12 +77,13 @@
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch4 -p1
+%patch5 -p1
 # Remove all binary libs, except ones needed to build docs and N/A elsewhere.
 find . -name "*.jar" \
   ! -name xalan2jdoc.jar \
   ! -name stylebook-1.0-b3_xalan-2.jar \
   -exec rm -f {} \;
-%patch4 -p1
 
 %build
 if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi
@@ -216,6 +218,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jun 28 2005 Gary Benson <gbenson at redhat.com> 0:2.6.0-3jpp_2fc
+- Remove a tarball from the tarball too.
+- Fix demo subpackage's dependencies.
+
 * Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:2.6.0-3jpp_1fc
 - Remove jarfiles from the tarball.