SPECS: ApacheJServ.spec - catch missing jar error

[glen]

Author: glen                         Date: Tue Dec 11 16:48:11 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- catch missing jar error

---- Files affected:
SPECS:
   ApacheJServ.spec (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: SPECS/ApacheJServ.spec
diff -u SPECS/ApacheJServ.spec:1.64 SPECS/ApacheJServ.spec:1.65
--- SPECS/ApacheJServ.spec:1.64	Tue Dec 11 17:43:26 2007
+++ SPECS/ApacheJServ.spec	Tue Dec 11 17:48:05 2007
@@ -85,17 +85,18 @@
 %patch3 -p1
 
 # servlet-2.0 is the highest version the jserv code compiles with
-sed -i -e "
-	s|@JSDK_CLASSES@|$(find-jar servlet-2.0)|g
+servlet_jar=$(find-jar servlet-2.0)
+%{__sed} -i -e "
+	s|@JSDK_CLASSES@|$servlet_jar)|g
 	s|@JAVA@|%java|g
 " conf/jserv.properties.in
 
 # do not load module in provided jserv.conf; we do this in httpd.conf
-sed -i -e 's|@LOAD_OR_NOT@|#|g' conf/jserv.conf.in
+%{__sed} -i -e 's|@LOAD_OR_NOT@|#|g' conf/jserv.conf.in
 
 # we don't want gcj related deps
-sed -i -e '/^SUBDIRS/s,java,,' src/Makefile.am
-sed -i -e '/^SUBDIRS/s,example,,' Makefile.am
+%{__sed} -i -e '/^SUBDIRS/s,java,,' src/Makefile.am
+%{__sed} -i -e '/^SUBDIRS/s,example,,' Makefile.am
 
 %build
 export JAVA_HOME="%{java_home}"
@@ -228,6 +229,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2007-12-11 16:48:05  glen
+- catch missing jar error
+
 Revision 1.64  2007-12-11 16:43:26  glen
 - cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ApacheJServ.spec?r1=1.64&r2=1.65&f=u