From d7cd6e4eed4a8f7d8989c26db23348ec1695be43 Mon Sep 17 00:00:00 2001
From: gbenson <gbenson@fedoraproject.org>
Date: Tue, 28 Jun 2005 09:33:38 +0000
Subject: [PATCH] Fix demo subpackage's dependencies and remove a tarball from
 the tarball

---
 .cvsignore    |  2 +-
 sources       |  2 +-
 xalan-j2.spec | 16 +++++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 24f5962..ce2a505 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -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
diff --git a/sources b/sources
index b70b012..16c42ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1308f13a9b5edeb545d8bde449397245  xalan-j_2_6_0-src-RHCLEAN.tar.bz2
+ed5d8bdfcac79989486ee418abe51f80  xalan-j_2_6_0-src-RHsemiCLEAN.tar.bz2
diff --git a/xalan-j2.spec b/xalan-j2.spec
index c2ef6e2..2d4f4ac 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -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 @@ Javadoc for %{name}.
 %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 @@ Demonstrations and samples for %{name}.
 %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 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
 %{_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.