rpms/tomcat5/F-10 tomcat5-5.5.init, 1.10, 1.11 tomcat5-5.5.relink, 1.7, 1.8 tomcat5.spec, 1.124, 1.125
David Walluck
dwalluck at fedoraproject.org
Wed Dec 10 18:50:25 UTC 2008
Author: dwalluck
Update of /cvs/pkgs/rpms/tomcat5/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31719
Modified Files:
tomcat5-5.5.init tomcat5-5.5.relink tomcat5.spec
Log Message:
- fix bug #473755
- fix extra newline in initscript
Index: tomcat5-5.5.init
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-10/tomcat5-5.5.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tomcat5-5.5.init 13 Oct 2008 20:58:23 -0000 1.10
+++ tomcat5-5.5.init 10 Dec 2008 18:49:54 -0000 1.11
@@ -198,7 +198,7 @@
else
log_failure_msg
fi
- echo
+ #echo
return $RETVAL
}
@@ -250,19 +250,23 @@
fi
kill -9 $kpid
fi
- log_success_msg
- if [ "$count" -gt "0" ]; then
+ if [ "$STOP_VERBOSE" = "true" -a "$count" -gt "0" ]; then
echo -n -e "\n"
fi
+ log_success_msg
+ else
+ log_failure_msg
fi
rm -f /var/lock/subsys/$NAME /var/run/$NAME.pid
else
log_failure_msg
fi
+ else
+ log_failure_msg
fi
+ #echo
}
-
# See how we were called.
case "$1" in
start)
Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-10/tomcat5.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- tomcat5.spec 22 Oct 2008 21:47:59 -0000 1.124
+++ tomcat5.spec 10 Dec 2008 18:49:54 -0000 1.125
@@ -71,7 +71,7 @@
Name: tomcat5
Epoch: 0
Version: %{majversion}.%{minversion}
-Release: 4.9%{dist}
+Release: 6%{dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
Group: Networking/Daemons
@@ -110,6 +110,9 @@
Patch19: %{name}-%{majversion}-connectors-util-build.patch
BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
+%if ! %{gcj_support}
+BuildArch: noarch
+%endif
Buildrequires: jpackage-utils >= 0:1.7.4
BuildRequires: java-1.6.0-devel
@@ -120,21 +123,22 @@
%endif
BuildRequires: ant-trax
BuildRequires: xalan-j2
-BuildRequires: jakarta-commons-beanutils >= 1.7
+BuildRequires: jakarta-commons-beanutils >= 0:1.7
BuildRequires: jakarta-commons-collections >= 0:3.1
-BuildRequires: jakarta-commons-daemon >= 1.0
+BuildRequires: jakarta-commons-daemon >= 0:1.0.1
BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
BuildRequires: jakarta-commons-digester >= 0:1.7
BuildRequires: jakarta-commons-logging >= 0:1.0.4
BuildRequires: jakarta-commons-fileupload >= 0:1.0
BuildRequires: jakarta-commons-io >= 0:1.3
-BuildRequires: jakarta-commons-modeler >= 2.0
+BuildRequires: jakarta-commons-modeler >= 0:2.0
BuildRequires: jakarta-commons-pool >= 0:1.2
BuildRequires: jakarta-commons-launcher >= 0:0.9
BuildRequires: jakarta-commons-el >= 0:1.0
BuildRequires: junit >= 0:3.8.1
BuildRequires: regexp >= 0:1.3
BuildRequires: struts >= 0:1.2.9
+#BuildRequires: struts-taglib >= 0:1.3.8
BuildRequires: xerces-j2 >= 0:2.7.1
BuildRequires: zip
# xml-commons-apis is needed by Xerces-J2
@@ -152,8 +156,6 @@
# libgcj aot-compiled native libraries
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
-%else
-BuildArch: noarch
%endif
Requires(post): jpackage-utils >= 0:1.7.4
Requires(post): /bin/rm
@@ -166,23 +168,30 @@
Requires(preun): findutils
Requires(pre): %{_sbindir}/useradd
Requires(pre): %{_sbindir}/groupadd
-Requires(post): jakarta-commons-dbcp-tomcat5
-Requires(post): jakarta-commons-collections-tomcat5
-Requires(post): jakarta-commons-pool-tomcat5
+Requires(post): jakarta-commons-dbcp-tomcat5 >= 0:1.2.1
+Requires(post): jakarta-commons-collections-tomcat5 >= 0:3.1
+Requires(post): jakarta-commons-pool-tomcat5 >= 0:1.2
+Requires: jaf = 0:1.0.2
+Requires(post): jaf = 0:1.0.2
+Requires: jakarta-commons-logging >= 0:1.0.4
+Requires(post): jakarta-commons-logging >= 0:1.0.4
+Requires: javamail = 0:1.3.1
+Requires(post): javamail = 0:1.3.1
+%if %{with_ecj}
+Requires: ecj >= 0:3.3.1.1
+Requires(post): ecj >= 0:3.3.1.1
+%endif
%endif
Requires: jpackage-utils >= 0:1.7.4
# xml parsing packages
Requires: xerces-j2 >= 0:2.7.1
Requires: xml-commons-jaxp-1.3-apis
# jakarta-commons packages
-Requires: jakarta-commons-daemon >= 1.0.1
+Requires: jakarta-commons-daemon >= 0:1.0.1
+Requires(post): jakarta-commons-daemon >= 0:1.0.1
Requires: jakarta-commons-launcher >= 0:0.9
# alternatives
Requires: java-1.6.0-devel
-%if %{with_ecj}
-Requires: ecj >= 0:3.3.1.1
-Requires(post): ecj >= 0:3.3.1.1
-%endif
# And it needs its own API subpackages for running
Requires: %{name}-common-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-server-lib = %{epoch}:%{version}-%{release}
@@ -223,6 +232,7 @@
Requires(pre): %{name} = %{epoch}:%{version}-%{release}
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
Requires: struts >= 0:1.2.9
+#Requires: struts-taglib >= 0:1.3.8
Requires(post): /bin/rm
Requires(post): jpackage-utils >= 0:1.7.4
Requires(post): findutils
@@ -231,6 +241,7 @@
Requires(post): jakarta-commons-digester
Requires(post): jakarta-commons-io
Requires(post): struts
+#Requires(post): struts-taglib
Requires(preun): findutils
Requires(preun): /bin/rm
@@ -268,7 +279,7 @@
%package jsp-%{jspspec}-api
Group: Internet/WWW/Dynamic Content
Requires: %{_sbindir}/update-alternatives
-Requires: servlet24
+Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
# We need this to indirectly get rid of legacy jsp included in old
# servlet packages (one day we will be able to remove this)
# Replace PreReq
@@ -330,8 +341,8 @@
Group: Development/Compilers
Summary: Libraries needed to run the Tomcat Web container (part)
Requires(post): jpackage-utils >= 0:1.7.4
-Requires: jakarta-commons-modeler >= 2.0
-Requires(post): jakarta-commons-modeler >= 2.0
+Requires: jakarta-commons-modeler >= 0:2.0
+Requires(post): jakarta-commons-modeler >= 0:2.0
# Other subpackages must go in first
Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release}
Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release}
@@ -406,6 +417,8 @@
%{__rm} %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
%endif
+#find -type f -name '*.jsp' | xargs -t perl -pi -e 's/<html:html locale="true">/<html:html>/g'
+
%build
# remove pre-built binaries
for dir in ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname} ; do
@@ -543,7 +556,7 @@
unzip -qq ../apache-tomcat-%{version}-src/build/build/common/lib/jasper-compiler.jar
unzip -qq ../apache-tomcat-%{version}-src/build/build/common/lib/jasper-runtime.jar \
-x META-INF/MANIFEST.MF org/apache/jasper/compiler/Localizer.class
-unzip -qq %{_javadir}/jdtcore.jar -x META-INF/MANIFEST.MF
+unzip -qq %{_javadir}/ecj.jar -x META-INF/MANIFEST.MF
cp -p %{SOURCE7} META-INF/MANIFEST.MF
rm -f plugin.properties plugin.xml about.html jdtCompilerAdapter.jar META-INF/eclipse.inf
zip -qq -r ../org.apache.jasper_5.5.17.v200706111724.jar .
@@ -563,7 +576,7 @@
%{__rm} -rf $RPM_BUILD_ROOT
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}
%if %{without_apisonly}
-export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar"
+export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar":${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar
# build initial path structure
%{__install} -d -m 755 \
${RPM_BUILD_ROOT}{%{confdir},%{logdir},%{homedir},%{bindir}}
@@ -1190,8 +1203,8 @@
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap*
-#%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon*
-#%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api*
+#%%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon*
+#%%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api*
#%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli*
%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-jkstatus-ant*
%endif
@@ -1348,6 +1361,10 @@
%endif
%changelog
+* Wed Dec 10 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-6.1
+- fix bug #473755
+- fix extra newline in initscript
+
* Wed Oct 22 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-4.9
- revert jasper-eclipse location change as it won't work on noarch
More information about the fedora-extras-commits
mailing list