packages (DEVEL): tomcat/tomcat.spec - disable extras.

[pawelz]

Author: pawelz                       Date: Wed Jun  9 11:04:13 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- disable extras.

---- Files affected:
packages/tomcat:
   tomcat.spec (1.172.2.3 -> 1.172.2.4) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.3 packages/tomcat/tomcat.spec:1.172.2.4
--- packages/tomcat/tomcat.spec:1.172.2.3	Wed Jun  9 01:13:52 2010
+++ packages/tomcat/tomcat.spec	Wed Jun  9 13:04:04 2010
@@ -2,7 +2,7 @@
 
 # Conditional build:
 %bcond_without	javadoc		# skip building javadocs
-%bcond_without	webservices	# skip building webservices
+%bcond_with		extras		# build extras
 
 %define		jspapiver	2.1
 %define		servletapiver	2.5
@@ -36,7 +36,7 @@
 BuildRequires:	java-commons-daemon >= 1.0
 BuildRequires:	java-commons-dbcp-tomcat5 >= 0:1.1
 BuildRequires:	java-commons-pool-tomcat5
-%if %{with webservices}
+%if %{with extras}
 BuildRequires:	java(JSR109)
 BuildRequires:	java-geronimo-spec-jaxrpc
 %endif
@@ -229,7 +229,7 @@
 cp %{SOURCE3} build.properties
 
 %build
-TOPDIR=$(pwd)
+export LC_ALL=en_US
 
 %ant -Drpm.javadir=%{_javadir} -Drpm.libdir=%{_libdir}
 
@@ -237,7 +237,7 @@
 %ant javadoc
 %endif
 
-%if %{with webservices}
+%if %{with extras}
 mkdir -p output/extras/webservices
 
 ln -s %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
@@ -316,7 +316,7 @@
 ln -sf %{_javadir}/tomcat6-catalina.jar $TOMCATDIR/lib/catalina.jar
 ln -sf %{_javadir}/tomcat6-coyote.jar $TOMCATDIR/lib/tomcat-coyote.jar
 
-%if %{with webservices}
+%if %{with extras}
 install ../extras/catalina-ws.jar $TOMCATDIR/lib/catalina-ws.jar
 
 ln -s %{_javadir}/geronimo-spec-jaxrpc.jar $TOMCATDIR/lib/jaxrpc.jar
@@ -424,7 +424,7 @@
 %config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/examples.xml
 %{_tomcatdir}/webapps/examples
 
-%if %{with webservices}
+%if %{with extras}
 %files webservices
 %defattr(644,root,root,755)
 %{_tomcatdir}/lib/catalina-ws.jar
@@ -456,6 +456,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172.2.4  2010/06/09 11:04:04  pawelz
+- disable extras.
+
 Revision 1.172.2.3  2010/06/08 23:13:52  pawelz
 - don't try to package tomcat-native nor commons-daemon. These libs are
   packages as separate specs.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.3&r2=1.172.2.4&f=u