Author: paszczus Date: Wed Apr 1 07:43:07 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- removed unused Patch2
- changed BR from apache-tomcat to apache-tomcat-jasper
---- Files affected:
SPECS:
scalix.spec (1.24 -> 1.25)
---- Diffs:
================================================================
Index: SPECS/scalix.spec
diff -u SPECS/scalix.spec:1.24 SPECS/scalix.spec:1.25
--- SPECS/scalix.spec:1.24 Tue Mar 31 22:49:24 2009
+++ SPECS/scalix.spec Wed Apr 1 09:43:02 2009
@@ -28,13 +28,12 @@
Source5: %{name}-mobile.xml
Patch0: %{name}-python25_26.patch
Patch1: %{name}-merlin-fixes.patch
-Patch2: %{name}-build.patch
URL: http://www.scalix.com/community/
BuildRequires: ant >= 1.6.5
BuildRequires: ant-junit
BuildRequires: ant-nodeps
BuildRequires: antlr >= 2.7.6
-BuildRequires: apache-tomcat
+BuildRequires: apache-tomcat-jasper
BuildRequires: asm2 >= 2.2.3
BuildRequires: java-commons-cli
BuildRequires: java-commons-codec
@@ -101,11 +100,11 @@
%{__tar} zxf scalix-sis-src.tgz
%patch0 -p0
%patch1 -p0
-#%patch2 -p1
%build
-CLASSPATH=caa/build/WEB-INF/classes:res/build/WEB-INF/classes:lib/spring.jar:lib/hibernate3.jar:lib/c3p0-0.9.1.jar:$(build-classpath-directory
%{_datadir}/tomcat/common/lib/):$(build-classpath activation antlr asm2
commons-cli commons-codec commons-collections commons-el commons-httpclient
commons-lang commons-logging ical4j log4j lucene lucene-snowball jdom jsp-api
mail saaj servlet xalan xercesImpl)
+CLASSPATH=caa/build/WEB-INF/classes:res/build/WEB-INF/classes:lib/spring.jar:lib/hibernate3.jar:lib/c3p0-0.9.1.jar:$(build-classpath
activation antlr asm2 commons-cli commons-codec commons-collections commons-el
commons-httpclient commons-lang commons-logging ical4j log4j lucene
lucene-snowball jasper-compiler jasper-runtime jdom jsp-api saaj servlet xalan
xercesImpl)
+
PACKAGES="installer mobile platform sac sis"
for i in $PACKAGES
@@ -183,6 +182,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.25 2009/04/01 07:43:02 paszczus
+- removed unused Patch2
+- changed BR from apache-tomcat to apache-tomcat-jasper
+
Revision 1.24 2009/03/31 20:49:24 paszczus
- proper bcond for java_sun and BR for it
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scalix.spec?r1=1.24&r2=1.25&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
