Author: glen Date: Mon Jan 8 11:27:09 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- builds on amd64 with java-sun
---- Files affected:
SPECS:
ApacheJServ.spec (1.54 -> 1.55)
---- Diffs:
================================================================
Index: SPECS/ApacheJServ.spec
diff -u SPECS/ApacheJServ.spec:1.54 SPECS/ApacheJServ.spec:1.55
--- SPECS/ApacheJServ.spec:1.54 Mon Jan 8 12:04:04 2007
+++ SPECS/ApacheJServ.spec Mon Jan 8 12:27:03 2007
@@ -153,15 +153,17 @@
### JSERV
CFLAGS="$(%{apxs} -q CFLAGS) %{rpmcflags}"
+dir=$(pwd)
%configure \
%{!?debug:--disable-debugging} \
--with-apxs=%{apxs} \
--with-logdir=%{logdir} \
--with-servlets=%{_datadir}/jserv/servlets \
- %{!?with_gcj:GCJ=javac GCJFLAGS= CLASSPATH=`pwd` JAVAC_OPT="-source
1.4"} \
- %{!?with_gcj:--with-javac=%{_bindir}/javac --with-java=%{_bindir}/java
--with-jdk-home=%{_libdir}/java} \
- %{?with_gcj:--with-javac=%{_bindir}/gcj --with-jar=%{_bindir}/fastjar} \
- --with-JSDK=`pwd`/classpathx_servlet-%{jsdkversion}/servlet-2.0.jar
+ --with-java-platform=1.4 \
+ --with-JSDK=$dir/classpathx_servlet-%{jsdkversion}/servlet-2.0.jar \
+ %{!?with_gcj:GCJ=javac GCJFLAGS= CLASSPATH=$dir JAVAC_OPT="-source
1.4"} \
+ %{!?with_gcj:--with-javac=%{javac} --with-java=%{java}
--with-jdk-home=$JAVA_HOME} \
+ %{?with_gcj:--with-javac=%{_bindir}/gcj --with-jar=%{_bindir}/fastjar} \
%{__make} %{!?with_gcj:OBJEXT=class JAVAC_OPT='-source 1.4'} \
-C src/java
@@ -255,6 +257,7 @@
%attr(640,root,jserv) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/jserv.properties
%attr(640,root,jserv) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/zone.properties
%attr(754,root,root) /etc/rc.d/init.d/jserv
+%attr(755,root,root) %{_sbindir}/runjserv
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/jserv
%{_javadir}/ApacheJServ.jar
%{_javadir}/servlet-2.0.jar
@@ -286,6 +289,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.55 2007/01/08 11:27:03 glen
+- builds on amd64 with java-sun
+
Revision 1.54 2007/01/08 11:04:04 glen
- try new java build method
- updated initscript to run output logged to a file
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/ApacheJServ.spec?r1=1.54&r2=1.55&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
