rpms/tomcat5/devel tomcat5-5.0.30-no-daemon.patch, NONE, 1.1 jasper5_command.patch, 1.1, 1.2 tomcat5.spec, 1.16, 1.17 tomcat5-5.0.30-no-jsvc-tar.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu May 5 14:56:26 UTC 2005
Author: gbenson
Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22262
Modified Files:
jasper5_command.patch tomcat5.spec
Added Files:
tomcat5-5.0.30-no-daemon.patch
Removed Files:
tomcat5-5.0.30-no-jsvc-tar.patch
Log Message:
Remove references to the never used commons-daemon
tomcat5-5.0.30-no-daemon.patch:
build.xml | 4 ----
1 files changed, 4 deletions(-)
--- NEW FILE tomcat5-5.0.30-no-daemon.patch ---
--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml~ 2005-05-05 15:10:04.000000000 +0100
+++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml 2005-05-05 15:22:29.000000000 +0100
@@ -141,10 +141,6 @@
<copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" />
- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}"
- failonerror="false" />
-
<copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
<copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/>
</target>
jasper5_command.patch:
jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh | 2 -
jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh | 30 ++++++++-------
2 files changed, 17 insertions(+), 15 deletions(-)
Index: jasper5_command.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/jasper5_command.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jasper5_command.patch 26 Apr 2005 11:02:18 -0000 1.1
+++ jasper5_command.patch 5 May 2005 14:56:23 -0000 1.2
@@ -11,7 +11,7 @@
# 1. owned by the user
--- jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh.orig 2004-01-28 07:32:45.000000000 -0500
+++ jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh 2004-01-28 07:21:07.000000000 -0500
-@@ -53,26 +53,29 @@
+@@ -53,26 +53,28 @@
fi
# Get standard Java environment variables
@@ -49,12 +49,11 @@
+commons-el \
+commons-collections \
+commons-logging \
-+commons-daemon \
+)
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
-@@ -103,7 +106,7 @@
+@@ -103,7 +105,7 @@
else
Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tomcat5.spec 5 May 2005 13:07:49 -0000 1.16
+++ tomcat5.spec 5 May 2005 14:56:23 -0000 1.17
@@ -44,14 +44,14 @@
Source9: %{name}-%{majversion}.relink
Patch1: %{name}-%{version}.patch
Patch2: %{name}-%{majversion}.link_admin_jar.patch
-Patch3: %{name}-%{version}-no-jsvc-tar.patch
Patch4: %{name}-%{version}-cluster-pathelement.patch
Patch5: %{name}-%{version}-skip-build-on-install.patch
Patch6: %{name}-%{version}-javaxssl.patch
Patch7: %{jname}_command.patch
Patch8: %{name}-%{version}-bootstrap.MF.patch
Patch9: %{name}-%{version}-catalina.sh.patch
-Patch10: %{name}-%{version}-nojspc.patch
+Patch10: %{name}-%{version}-nojspc.patch
+Patch11: %{name}-%{version}-no-daemon.patch
BuildRoot: %{_tmppath}/%{name}-root-%{version}
Obsoletes: tomcat tomcat-libs tomcat-devel tomcat-test
@@ -67,7 +67,6 @@
# jakarta packages
Requires: jakarta-commons-beanutils >= 0:1.7.0
Requires: jakarta-commons-collections >= 0:3.1
-Requires: jakarta-commons-daemon
Requires: jakarta-commons-dbcp >= 0:1.2.1
Requires: jakarta-commons-digester >= 0:1.3
Requires: jakarta-commons-modeler
@@ -99,7 +98,6 @@
BuildRequires: xalan-j2
BuildRequires: jakarta-commons-beanutils >= 0:1.7.0
BuildRequires: jakarta-commons-collections >= 0:3.1
-BuildRequires: jakarta-commons-daemon
BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
BuildRequires: jakarta-commons-digester >= 0:1.3
BuildRequires: jakarta-commons-logging >= 0:1.0.4
@@ -170,7 +168,6 @@
Requires: jakarta-commons-el >= 0:1.0
Requires: jakarta-commons-collections >= 0:2.1
Requires: jakarta-commons-logging >= 0:1.0.3
-Requires: jakarta-commons-daemon >= 0:1.0
Requires: %{name}-servlet-2.4-api = %{epoch}:%{version}-%{release}
Obsoletes: jasper5
Provides: jasper5
@@ -219,7 +216,6 @@
# %patch0
%patch1 -p2
%patch2 -p2
-# %patch3 -p2 -b .nojsvc
%patch4 -p2 -b .cluster
%patch5 -p2 -b .skip
%patch6 -p0
@@ -227,6 +223,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p2 -b .orig
+%patch11 -p2 -b .orig
%build
@@ -266,7 +263,6 @@
commons-beanutils.jar=$(build-classpath commons-beanutils)
commons-fileupload.jar=$(build-classpath commons-fileupload)
commons-collections.jar=$(build-classpath commons-collections)
-commons-daemon.jar=$(build-classpath commons-daemon)
commons-dbcp.jar=$(build-classpath commons-dbcp)
commons-digester.jar=$(build-classpath commons-digester)
commons-el.jar=$(build-classpath commons-el)
@@ -320,7 +316,6 @@
junit.jar=$(build-classpath junit)
commons-beanutils.jar=$(build-classpath commons-beanutils)
commons-collections.jar=$(build-classpath commons-collections)
-commons-daemon.jar=$(build-classpath commons-daemon)
commons-digester.jar=$(build-classpath commons-digester)
commons-fileupload.jar=$(build-classpath commons-fileupload)
commons-logging.jar=$(build-classpath commons-logging)
@@ -877,6 +872,9 @@
%{serverdir}/webapps/*
%changelog
+* Thu May 5 2005 Gary Benson <gbenson at redhat.com>
+- Remove references to the never used commons-daemon.
+
* Thu May 5 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-5jpp_3fc
- Add dependencies for %post and %postun scriptlets (#156901).
--- tomcat5-5.0.30-no-jsvc-tar.patch DELETED ---
More information about the fedora-cvs-commits
mailing list