SPARK-1718 removing bundling of old java in RPM

This commit is contained in:
wroot
2016-04-06 11:50:04 +03:00
parent a352d30f0e
commit 1fffef8cf1
3 changed files with 2 additions and 6 deletions

View File

@ -1004,7 +1004,7 @@
</target> </target>
<!-- installer.rpm ========================================================================= --> <!-- installer.rpm ========================================================================= -->
<property name="bundle.jre" value="true" /> <property name="bundle.jre" value="false" />
<property name="target.work.subdir" value="rpm" /> <property name="target.work.subdir" value="rpm" />
<property name="target.rpm" value="${work.dir}/${target.work.subdir}" /> <property name="target.rpm" value="${work.dir}/${target.work.subdir}" />
<property name="rpm.spec.file" value="${basedir}/build/rpm/spark.spec"/> <property name="rpm.spec.file" value="${basedir}/build/rpm/spark.spec"/>

Binary file not shown.

View File

@ -5,7 +5,6 @@ Release: 1
License: Apache license v2.0 License: Apache license v2.0
Group: misc/Spark Group: misc/Spark
Source: %{SPARK_SOURCE} Source: %{SPARK_SOURCE}
Source1: jre-dist.tar.gz
BuildRoot: %{_tmppath}/build-root-%{name} BuildRoot: %{_tmppath}/build-root-%{name}
Packager: igniterealtime.org Packager: igniterealtime.org
Distribution: Linux Distribution: Linux
@ -177,7 +176,4 @@ exit 0
/usr/share/spark/xtra/emoticons/GTalk.AdiumEmoticonset.zip /usr/share/spark/xtra/emoticons/GTalk.AdiumEmoticonset.zip
/usr/share/spark/xtra/emoticons/POPO.adiumemoticonset.zip /usr/share/spark/xtra/emoticons/POPO.adiumemoticonset.zip
/usr/share/spark/xtra/emoticons/sparkEmoticonSet.zip /usr/share/spark/xtra/emoticons/sparkEmoticonSet.zip
%{homedir}/jre %{homedir}/jre