- use $JAVACMD from jpackage-utils

[packages/ApacheJServ.git] / ApacheJServ.spec

diff --git a/ApacheJServ.spec b/ApacheJServ.spec
index 34e00c04c1e1a7e09bc81e21cb9403527ac6e67d..abf1b1859e138ad493b469a1a2ddced14ca9ad04 100644 (file)
--- a/ApacheJServ.spec
+++ b/ApacheJServ.spec
@@ -5,7 +5,7 @@ Summary:        Servlet engine with support for the leading web server
 Summary(pl.UTF-8):     Silnik serwletów ze wsparciem dla wiodącego serwera WWW
 Name:          ApacheJServ
 Version:       1.1.2
-Release:       5
+Release:       7
 License:       freely distributable & usable
 Group:         Networking/Daemons
 Source0:       http://java.apache.org/jserv/dist/%{name}-%{version}.tar.gz
@@ -48,7 +48,6 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 %define                httpdconf       %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 %define                _sysconfdir     /etc/jserv
-%define                _noautocompressdoc  package-list
 
 %description
 Apache JServ is a servlet engine, developed by the Java Apache Project
@@ -85,17 +84,18 @@ Moduł JServ dla Apache'a.
 %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}"