This commit is contained in:
parent
930222e5b7
commit
f0514a4f19
22
scala.spec
22
scala.spec
@ -90,11 +90,9 @@ Requires: jline >= 2.10
|
|||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
Name: %{base_name}-bootstrap
|
Name: %{base_name}-bootstrap
|
||||||
Provides: %{base_name}
|
|
||||||
%else
|
%else
|
||||||
Name: %{base_name}
|
Name: %{base_name}
|
||||||
BuildRequires: %{base_name}
|
BuildRequires: %{base_name}-bootstrap
|
||||||
Provides: %{base_name}-bootstrap
|
|
||||||
Obsoletes: %{base_name}-bootstrap
|
Obsoletes: %{base_name}-bootstrap
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -169,23 +167,25 @@ sed -i '/is not supported by/d' build.xml
|
|||||||
sed -i '/exec.*pull-binary-libs.sh/d' build.xml
|
sed -i '/exec.*pull-binary-libs.sh/d' build.xml
|
||||||
|
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
%global do_bootstrap -DdoBootstrapBuild=yes
|
%global do_bootstrap -DdoBootstrapBuild=yes -Dlocker.skip=1
|
||||||
|
%global docs_target %{nil}
|
||||||
tar -xzvf %{SOURCE2}
|
tar -xzvf %{SOURCE2}
|
||||||
%if %{want_jdk8}
|
%if %{want_jdk8}
|
||||||
tar -xzvf %{SOURCE4} --strip-components=1 scala-2.10.4/lib
|
tar -xzvf %{SOURCE4} --strip-components=1 scala-2.10.4/lib
|
||||||
%endif
|
%endif
|
||||||
%else
|
%else
|
||||||
%global do_bootstrap %{nil}
|
%global do_bootstrap %{nil}
|
||||||
|
%global docs_target docs
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
pushd lib
|
pushd lib
|
||||||
%if %{without bootstrap}
|
%if %{without bootstrap}
|
||||||
rm -rf scala-compiler.jar
|
rm -rf scala-compiler.jar
|
||||||
ln -s $(build-classpath scala/scala-compiler.jar) scala-compiler.jar
|
ln -s $(find-jar scala/scala-compiler) scala-compiler.jar
|
||||||
rm -rf scala-library.jar
|
rm -rf scala-library.jar
|
||||||
ln -s $(build-classpath scala/scala-library.jar) scala-library.jar
|
ln -s $(find-jar scala/scala-library) scala-library.jar
|
||||||
rm -rf scala-reflect.jar
|
rm -rf scala-reflect.jar
|
||||||
ln -s $(build-classpath scala/scala-reflect.jar) scala-reflect.jar
|
ln -s $(find-jar scala/scala-reflect) scala-reflect.jar
|
||||||
%endif
|
%endif
|
||||||
pushd ant
|
pushd ant
|
||||||
rm -rf ant.jar
|
rm -rf ant.jar
|
||||||
@ -207,7 +207,7 @@ chmod 755 tools/get-scala-*
|
|||||||
|
|
||||||
export ANT_OPTS="-Xms2048m -Xmx2048m %{do_bootstrap}"
|
export ANT_OPTS="-Xms2048m -Xmx2048m %{do_bootstrap}"
|
||||||
|
|
||||||
%ant build docs || exit 1
|
%ant build %{docs_target} || exit 1
|
||||||
pushd build/pack/lib
|
pushd build/pack/lib
|
||||||
mv scala-library.jar scala-library.jar.no
|
mv scala-library.jar scala-library.jar.no
|
||||||
bnd wrap --properties %{SOURCE1} --output scala-library.jar \
|
bnd wrap --properties %{SOURCE1} --output scala-library.jar \
|
||||||
@ -279,8 +279,10 @@ install -p -m 644 %{SOURCE23} %{buildroot}%{_datadir}/mime/packages/
|
|||||||
|
|
||||||
sed -i -e 's,@JAVADIR@,%{_javadir},g' -e 's,@DATADIR@,%{_datadir},g' %{buildroot}%{_bindir}/*
|
sed -i -e 's,@JAVADIR@,%{_javadir},g' -e 's,@DATADIR@,%{_datadir},g' %{buildroot}%{_bindir}/*
|
||||||
|
|
||||||
|
%if %{without bootstrap}
|
||||||
install -d %{buildroot}%{_mandir}/man1
|
install -d %{buildroot}%{_mandir}/man1
|
||||||
install -p -m 644 build/scaladoc/manual/man/man1/* %{buildroot}%{_mandir}/man1
|
install -p -m 644 build/scaladoc/manual/man/man1/* %{buildroot}%{_mandir}/man1
|
||||||
|
%endif
|
||||||
|
|
||||||
%files -f .mfiles
|
%files -f .mfiles
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
@ -290,7 +292,9 @@ install -p -m 644 build/scaladoc/manual/man/man1/* %{buildroot}%{_mandir}/man1
|
|||||||
%exclude %{_datadir}/%{base_name}/lib/scala-swing.jar
|
%exclude %{_datadir}/%{base_name}/lib/scala-swing.jar
|
||||||
%{_datadir}/mime-info
|
%{_datadir}/mime-info
|
||||||
%{_datadir}/mime/packages/*
|
%{_datadir}/mime/packages/*
|
||||||
|
%if %{without bootstrap}
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
%endif
|
||||||
%license docs/LICENSE
|
%license docs/LICENSE
|
||||||
|
|
||||||
%files swing -f .mfiles-swing
|
%files swing -f .mfiles-swing
|
||||||
@ -303,8 +307,10 @@ install -p -m 644 build/scaladoc/manual/man/man1/* %{buildroot}%{_mandir}/man1
|
|||||||
%config %{_sysconfdir}/ant.d/*
|
%config %{_sysconfdir}/ant.d/*
|
||||||
%license docs/LICENSE
|
%license docs/LICENSE
|
||||||
|
|
||||||
|
%if %{without bootstrap}
|
||||||
%files apidoc
|
%files apidoc
|
||||||
%doc build/scaladoc/library/*
|
%doc build/scaladoc/library/*
|
||||||
%license docs/LICENSE
|
%license docs/LICENSE
|
||||||
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user