Author: pawelz Date: Tue Jul 20 11:57:23 2010 GMT Module: packages Tag: DEVEL ---- Log message: - merged changes from HEAD: - apply URIEncoding="UTF-8" patch - small fixes like cp -a instead of install - rel 2
---- Files affected: packages/tomcat: tomcat.spec (1.172.2.15 -> 1.172.2.16) ---- Diffs: ================================================================ Index: packages/tomcat/tomcat.spec diff -u packages/tomcat/tomcat.spec:1.172.2.15 packages/tomcat/tomcat.spec:1.172.2.16 --- packages/tomcat/tomcat.spec:1.172.2.15 Tue Jul 13 01:25:38 2010 +++ packages/tomcat/tomcat.spec Tue Jul 20 13:57:18 2010 @@ -7,7 +7,7 @@ %define servletapiver 3.0 %define subver beta -%define rel 1 +%define rel 2 # Java Commons Logging version. Must be >= 1.1. %define jclver 1.1.1 @@ -32,6 +32,7 @@ Source100: http://www.apache.org/dist/commons/logging/source/commons-logging-%{jclver}-src.tar.gz # Source100-md5: e5cfa8cca13152d7545fde6b1783c60a Patch0: %{name}-build.xml.patch +Patch1: server.xml-URIEncoding-utf8.patch Patch100: jcl-build.xml.patch URL: http://tomcat.apache.org/ BuildRequires: ant >= 1.5.3 @@ -248,8 +249,8 @@ %prep %setup -q -a100 -n apache-%{name}-%{version}-src - %patch0 -p1 +%patch1 -p1 # Prepare java-commmons-logging sources mkdir -p output/extras/logging @@ -269,7 +270,9 @@ export LC_ALL=en_US # Base package -%ant -Drpm.javadir=%{_javadir} -Drpm.libdir=%{_libdir} +%ant \ + -Drpm.javadir=%{_javadir} \ + -Drpm.libdir=%{_libdir} # Extras mkdir -p output/extras/webservices @@ -309,16 +312,16 @@ $RPM_BUILD_ROOT/etc/sysconfig \ $RPM_BUILD_ROOT/etc/rc.d/init.d -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat -install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/tomcat +install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat +cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/tomcat cp -a conf/* $CATALINADIR/conf install -d $CATALINADIR/conf/Catalina/localhost -install %{SOURCE10} $CATALINADIR/conf/Catalina/localhost/ROOT.xml -install %{SOURCE11} $CATALINADIR/conf/Catalina/localhost/docs.xml -install %{SOURCE12} $CATALINADIR/conf/Catalina/localhost/manager.xml -install %{SOURCE13} $CATALINADIR/conf/Catalina/localhost/host-manager.xml -install %{SOURCE14} $CATALINADIR/conf/Catalina/localhost/examples.xml +cp -a %{SOURCE10} $CATALINADIR/conf/Catalina/localhost/ROOT.xml +cp -a %{SOURCE11} $CATALINADIR/conf/Catalina/localhost/docs.xml +cp -a %{SOURCE12} $CATALINADIR/conf/Catalina/localhost/manager.xml +cp -a %{SOURCE13} $CATALINADIR/conf/Catalina/localhost/host-manager.xml +cp -a %{SOURCE14} $CATALINADIR/conf/Catalina/localhost/examples.xml cp -a bin lib webapps $TOMCATDIR cp -a temp $CATALINADIR @@ -367,10 +370,10 @@ ln -sf %{_javadir}/tomcat-coyote.jar $TOMCATDIR/lib/tomcat-coyote.jar -install ../extras/catalina-ws.jar $TOMCATDIR/lib/catalina-ws.jar -install ../extras/catalina-jmx-remote.jar $TOMCATDIR/lib/catalina-jmx-remote.jar -install ../extras/tomcat-juli-adapters.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-juli-adapters.jar -install ../extras/tomcat-juli.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-juli.jar +cp -a ../extras/catalina-ws.jar $TOMCATDIR/lib/catalina-ws.jar +cp -a ../extras/catalina-jmx-remote.jar $TOMCATDIR/lib/catalina-jmx-remote.jar +cp -a ../extras/tomcat-juli-adapters.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-juli-adapters.jar +cp -a ../extras/tomcat-juli.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-juli.jar ln -sf %{_javadir}/tomcat-juli-adapters.jar $TOMCATDIR/lib/juli-adapters.jar ln -sf %{_javadir}/tomcat-juli.jar $TOMCATDIR/lib/juli.jar @@ -520,6 +523,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.172.2.16 2010/07/20 11:57:18 pawelz +- merged changes from HEAD: +- apply URIEncoding="UTF-8" patch +- small fixes like cp -a instead of install +- rel 2 + Revision 1.172.2.15 2010/07/12 23:25:38 pawelz - rel 1 (it works well for me) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.15&r2=1.172.2.16&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
