[jetty/f15] Additional changes needed to build Add tomcat6-lib and fix jsp-2.0 pom.xml file

[Jeff Johnston]

commit d07c2013bff91aa5df58a94e73bab04f1b08bbb8
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Thu Jan 19 17:52:20 2012 -0500

    Additional changes needed to build
    Add tomcat6-lib and fix jsp-2.0 pom.xml file

 jetty-jsp-2.0-pom.patch |   30 ++++++++++++++++++++++++++++++
 jetty.spec              |    5 +++++
 2 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/jetty-jsp-2.0-pom.patch b/jetty-jsp-2.0-pom.patch
new file mode 100644
index 0000000..935f833
--- /dev/null
+++ b/jetty-jsp-2.0-pom.patch
@@ -0,0 +1,30 @@
+diff -up ./modules/jsp-2.0/pom.xml.fix ./modules/jsp-2.0/pom.xml
+--- ./modules/jsp-2.0/pom.xml.fix	2012-01-19 17:41:18.000000000 -0500
++++ ./modules/jsp-2.0/pom.xml	2012-01-19 17:43:44.000000000 -0500
+@@ -26,7 +26,7 @@
+                 <delete failonerror="false" includeemptydirs="true">
+                  <fileset dir="../../lib/jsp-2.0">
+                    <include name="slf4j-simple-${slf4j-version}.jar" />
+-                   <include name="jcl104-over-slf4j-${slf4j-version}.jar" />
++                   <include name="slf4j-jcl-${slf4j-version}.jar" />
+                    <include name="jasper-compiler-jdt-${jasper-version}.jar" />
+                    <include name="commons-el-${commons-el-version}.jar" />
+                    <include name="xercesImpl-${xerces-version}.jar" />
+@@ -70,7 +70,7 @@
+                 </artifactItem>
+                 <artifactItem>
+                   <groupId>org.slf4j</groupId>
+-                  <artifactId>jcl104-over-slf4j</artifactId>
++                  <artifactId>slf4j-jcl</artifactId>
+                   <version>${slf4j-version}</version>
+                 </artifactItem>
+                 <artifactItem>
+@@ -130,7 +130,7 @@
+     </dependency>
+     <dependency>
+       <groupId>org.slf4j</groupId>
+-      <artifactId>jcl104-over-slf4j</artifactId>
++      <artifactId>slf4j-jcl</artifactId>
+       <version>${slf4j-version}</version>
+       <scope>runtime</scope>
+     </dependency>
diff --git a/jetty.spec b/jetty.spec
index f1a983a..b98841a 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -57,6 +57,7 @@ Patch0:	        disable-modules.patch
 Patch1:	        jetty-util-pom.patch
 Patch4:	        jetty-plugin-fix-site.patch
 Patch5:	        jetty-hashDOS.patch
+Patch6:	        jetty-jsp-2.0-pom.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -84,6 +85,8 @@ BuildRequires: maven-release-plugin
 BuildRequires: maven-surefire-plugin
 BuildRequires: maven-shared-dependency-tree
 BuildRequires: servlet25
+BuildRequires: tomcat6-lib
+BuildRequires: maven-skins
 BuildRequires: jsp21
 BuildRequires: slf4j
 BuildRequires: objectweb-asm
@@ -150,6 +153,7 @@ find . -name "*.class" -exec rm {} \;
 %patch1 -b .sav
 %patch4 -b .sav
 %patch5 -b .sav
+%patch6 -b .sav
 
 cp %{SOURCE1} djetty
 
@@ -375,6 +379,7 @@ fi
 %changelog
 * Mon Jan 16 2012 Jeff Johnston <jjohnstn at redhat.com> - 6.1.26-7
 - Resolves CVE-2011-4461
+- Add tomcat6-lib and fix jsp-2.0 pom.xml file
 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.1.26-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild