RPM: Fix JAVA HOME detection for openSUSE_13.2

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2336 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2015-02-15 12:08:04 +00:00
parent 1165e41831
commit 0f46596228
1 changed files with 6 additions and 5 deletions

View File

@ -56,11 +56,9 @@ window and full calendar support with attendees free/busy display.
%build %build
# JAVA_HOME points to the JDK root directory: ${JAVA_HOME}/{bin,lib} # JAVA_HOME points to the JDK root directory: ${JAVA_HOME}/{bin,lib}
jre=`rpm -q --whatprovides jre` jcompiler=`readlink -f $(which javac)`
jexec=`rpm -ql ${jre} | grep "jexec"` bin=`dirname ${jcompiler}` # level up
lib=`dirname ${jexec}` # level up java_home=`dirname ${bin}` # level up
jre=`dirname ${lib}` # level up
java_home=`dirname ${jre}` # level up
export JAVA_HOME=${java_home} export JAVA_HOME=${java_home}
# /scratch/rpmbuild/davmail-src-4.2.0-2066/build.xml:41: Please force UTF-8 encoding to build debian package with set ANT_OPTS=-Dfile.encoding=UTF-8 # /scratch/rpmbuild/davmail-src-4.2.0-2066/build.xml:41: Please force UTF-8 encoding to build debian package with set ANT_OPTS=-Dfile.encoding=UTF-8
export ANT_OPTS="-Dfile.encoding=UTF-8" export ANT_OPTS="-Dfile.encoding=UTF-8"
@ -168,6 +166,9 @@ fi
%attr(0775,davmail,davmail) %{_localstatedir}/lib/davmail %attr(0775,davmail,davmail) %{_localstatedir}/lib/davmail
%changelog %changelog
* Sun Feb 15 2015 Mickael Guessant <mguessan@free.fr>
- Fix JAVA HOME detection for openSUSE_13.2
* Sun Feb 01 2015 Achim Herwig <achim.herwig@wodca.de> * Sun Feb 01 2015 Achim Herwig <achim.herwig@wodca.de>
- Adapted spec for davmail-src-4.6.0-2331.tgz - Adapted spec for davmail-src-4.6.0-2331.tgz