[tomcat6/f13/master: 17/17] updating and preparing for merge

[Dave Knox]

commit 3d9e7861962b592896db4e9846eb70329eb40cd6
Merge: 7ae562f e4a5862
Author: david knox <dknox at 78-97-42-72.skybeam.com>
Date:   Wed Sep 29 14:45:49 2010 -0600

    updating and preparing for merge

 jsp-api-OSGi-MANIFEST.MF                |   13 +
 sources                                 |    3 +-
 tomcat6-6.0-bootstrap-MANIFEST.MF.patch |   13 +-
 tomcat6-6.0-log4j.properties            |   11 +
 tomcat6-6.0.init                        |   91 +++++---
 tomcat6-6.0.wrapper                     |   12 +-
 tomcat6.spec                            |  421 +++++++++++++++++++++++--------
 7 files changed, 410 insertions(+), 154 deletions(-)
---
diff --cc tomcat6.spec
index df04f65,6b7559a..73894e5
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@@ -54,7 -55,7 +55,11 @@@
  Name: tomcat6
  Epoch: 0
  Version: %{major_version}.%{minor_version}.%{micro_version}
++<<<<<<< HEAD
 +Release: 2%{?dist}
++=======
+ Release: 8%{?dist}
++>>>>>>> master
  Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
  
  Group: Networking/Daemons
@@@ -145,10 -164,11 +168,18 @@@ Group: Development/Compiler
  Summary: Libraries needed to run the Tomcat Web container
  Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
  Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
++<<<<<<< HEAD
 +Requires(post): ecj
 +Requires(post): jakarta-commons-collections-tomcat5
 +Requires(post): jakarta-commons-dbcp-tomcat5
 +Requires(post): jakarta-commons-pool-tomcat5
++=======
+ Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
+ Requires: ecj
+ Requires: jakarta-commons-collections-tomcat5
+ Requires: jakarta-commons-dbcp-tomcat5
+ Requires: jakarta-commons-pool-tomcat5
++>>>>>>> master
  Requires(preun): coreutils
  
  %description lib
@@@ -446,6 -597,44 +608,47 @@@ f
  %{appdir}/sample
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Fri Jul 02 2010 David Knox <dknox at rehat.com> 0:6.0.26-8
+ - LSB initscript compliance 
+ 
+ * Thu Jul 01 2010 David Knox <dknox at redhat.com> 0:6.0.26-7
+ - Made elspec the standard for elspec %post and %postun.
+ 
+ * Tue Jun 29 2010 David Knox <dknox at redhat.com> 0:6.0.26-6
+ - Completed package and file sections. Added el-spec. Fixed
+ - directory permission problems.
+ 
+ * Thu May 6 2010 David Knox <dknox at redhat.com> 0:6.0.26-5
+ - Working on 589145. Tomcat can't find java compiler for java.
+ 
+ * Tue Apr 08 2010 David Knox <dknox at redhat.com> 0:6.0.26-4
+ - Moved build-jar-repository to later in the install process.  
+ 
+ * Tue Apr 06 2010 David Knox <dknox at redhat.com> 0:6.0.26-3
+ - Incremented the Release tag to 3 to avoid any confusion about which
+ - is the most recent
+ 
+ * Tue Apr 06 2010 David Knox <dknox at redhat.com> 0:6.0.26-1
+ - Solved packaging problems involving taglibs-standard
+ - Solved packaging problems involving jakarta-commons
+ - Corrected Requires(post) to Requires and checked companion BuildRequires
+ 
+ * Mon Mar 29 2010 David Knox <dknox at redhat.com> 0:6.0.26-2
+ - Update source to tomcat6.0.26
+ - Bugzilla 572357 - Please retest. 
+ - OSGi manifests for servlet-api and jsp-api
+ 
+ 
+ * Fri Mar 26 2010 Mary Ellen Foster <mefoster at gmail.com> 0:6.0.24-2
+ - Add maven POMs and metadata
+ - Link tomcat6-juli into /usr/share/java/tomcat6
+ 
+ * Mon Mar 1 2010 Alexander Kurtakov <akurtako at redhat.com> 0:6.0.24-1
+ - Update to 6.0.24.
+ 
++>>>>>>> master
  * Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:6.0.20-2
  - Drop file requires on /usr/share/java/ecj.jar.