tabs

[packages/tomcat.git] / tomcat.spec

diff --git a/tomcat.spec b/tomcat.spec
index 802776efa6c6d98c56953fa5c49e677f28480513..e40e0cead213697f56dde01dabd3f05b00dc4ae2 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -90,8 +90,6 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define        _logdir         %{_var}/log
 %define                _vardir         %{_var}/lib/tomcat
 
-%define find_jar() %{expand:%%define jarfile {%(jar=$(find-jar %1); echo ${jar:-%%nil})}}%{?jarfile}%{!?jarfile:%{error:find-jar %1 failed}}%{nil}
-
 %description
 Tomcat is the servlet container that is used in the official Reference
 Implementation for the Java Servlet and JavaServer Pages technologies.
@@ -262,7 +260,7 @@ javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
 %patch5 -p1
 
 # Prepare java-commmons-logging sources
-mkdir -p output/extras/logging
+install -d output/extras/logging
 mv commons-logging-%{jclver}-src output/extras/logging
 cd output/extras/logging/commons-logging-%{jclver}-src
 %undos build.xml
@@ -273,34 +271,39 @@ cd -
 rm bin/*.bat
 rm bin/{startup,shutdown}.sh
 
-cp -a %{SOURCE3} build.properties
-cat >>build.properties <<EOF
-
-log4j.jar=%(find-jar log4j)
-log4j12.jar=%(find-jar log4j)
-junit.jar=%(find-jar junit)
-logkit.jar=%(find-jar avalon-logkit)
-avalon-framework-impl.jar=%(find-jar avalon-framework-impl.jar)
-avalon-framework-api.jar=%(find-jar avalon-framework-api.jar)
-servletapi.jar=$(pwd)/output/build/lib/servlet-api.jar
-commons-logging.version=%{jclver}
-EOF
+cp -p %{SOURCE3} build.properties
 
 %build
+if test ! -e build.properties.local; then
+       cat > build.properties.local <<-EOF
+       log4j.jar=$(find-jar log4j)
+       log4j12.jar=$(find-jar log4j)
+       junit.jar=$(find-jar junit)
+       logkit.jar=$(find-jar avalon-logkit)
+       avalon-framework-impl.jar=$(find-jar avalon-framework-impl.jar)
+       avalon-framework-api.jar=$(find-jar avalon-framework-api.jar)
+       servletapi.jar=$(pwd)/output/build/lib/servlet-api.jar
+       commons-logging.version=%{jclver}
+       EOF
+       cat build.properties.local >> build.properties
+fi
+if grep '=$' build.properties; then
+       : Some .jar could not be found
+       exit 1
+fi
+
 export LC_ALL=en_US
 
 # Base package
-%ant \
-       -Drpm.javadir=%{_javadir} \
-       -Drpm.libdir=%{_libdir}
+%ant
 
 # Extras
-mkdir -p output/extras/webservices
+install -d output/extras/webservices
 
 ln -sf %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
 ln -sf %{_javadir}/jsr109.jar output/extras/webservices/wsdl4j.jar
 
-%ant -Dcommons-logging-version=%{jclver} extras
+%ant extras
 
 # Javadoc
 %if %{with javadoc}
@@ -319,12 +322,12 @@ TOMCATDIRREV=$(echo %{_tomcatdir} | sed 's#[^/]\+#..#g;s#^/##')
 CATALINADIRREV=$(echo /var/lib/tomcat | sed 's#[^/]\+#..#g;s#^/##')
 
 install -d $TOMCATDIR \
-           $CATALINADIR/temp \
-           $RPM_BUILD_ROOT%{_vardir}/webapps \
-           $RPM_BUILD_ROOT%{_vardir}/work \
-           $RPM_BUILD_ROOT%{_logdir}/tomcat \
-               $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/Catalina/localhost \
-           $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d,logrotate.d}
+       $CATALINADIR/temp \
+       $RPM_BUILD_ROOT%{_vardir}/webapps \
+       $RPM_BUILD_ROOT%{_vardir}/work \
+       $RPM_BUILD_ROOT%{_logdir}/tomcat \
+       $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/Catalina/localhost \
+       $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d,logrotate.d}
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/tomcat
@@ -401,15 +404,15 @@ rm -rf $RPM_BUILD_ROOT
 # migrate /var/lib/tomcat/conf to /etc/tomcat
 if [ -d %{_vardir}/conf ] && [ ! -L %{_vardir}/conf ]; then
        if [ -d %{_sysconfdir}/%{name} ]; then
-                  if [ ! -L %{_sysconfdir}/%{name} ]; then
-                                  mv %{_vardir}/conf/* %{_sysconfdir}/%{name}
-                                  rmdir %{_vardir}/conf 2>/dev/null || mv -v %{_vardir}/conf{,.rpmsave}
-                  else
-                                  mv -v %{_sysconfdir}/%{name}{,.rpmsave}
-                                  mv %{_vardir}/conf %{_sysconfdir}/%{name}
-                  fi
+               if [ ! -L %{_sysconfdir}/%{name} ]; then
+                       mv %{_vardir}/conf/* %{_sysconfdir}/%{name}
+                       rmdir %{_vardir}/conf 2>/dev/null || mv -v %{_vardir}/conf{,.rpmsave}
+               else
+                       mv -v %{_sysconfdir}/%{name}{,.rpmsave}
+                       mv %{_vardir}/conf %{_sysconfdir}/%{name}
+               fi
        else
-                  mv %{_vardir}/conf %{_sysconfdir}/%{name}
+               mv %{_vardir}/conf %{_sysconfdir}/%{name}
        fi
        ln -s %{_sysconfdir}/%{name} %{_vardir}/conf
 fi