Merge latest changes from Marcin Dulak

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2101 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2013-05-10 17:21:26 +00:00
parent f69382ccc7
commit f96e874fd1
1 changed files with 187 additions and 186 deletions

View File

@ -27,7 +27,7 @@ Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd
Requires(post): coreutils, filesystem, /sbin/chkconfig
Requires(preun): /sbin/service, coreutils, /sbin/chkconfig, /usr/sbin/userdel, /usr/sbin/groupdel
Requires(postun): /sbin/service
Requires: /etc/init.d, logrotate, jre = 1.6.0
Requires: /etc/init.d, logrotate, jre >= 1.6.0
%define davmaildotproperties davmail.properties
@ -58,6 +58,7 @@ lib=`dirname ${jexec}` # level up
jre=`dirname ${lib}` # level up
java_home=`dirname ${jre}` # level up
export JAVA_HOME=${java_home}
export ANT_OPTS="-Dfile.encoding=UTF-8"
# we have java 1.6
ant -Dant.java.version=1.6