Properly symlink ant dependencies.

This commit is contained in:
Krzysztof Daniel 2013-03-20 14:01:47 +01:00
parent 1ee81143a8
commit 0b0fec3f52

View File

@ -57,7 +57,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
Release: 0.27.git38f1df9%{?dist}
Release: 0.28.git38f1df9%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -472,9 +472,10 @@ for f in `find eclipse.platform.team/bundles/org.eclipse.core.net/fragments -nam
done
#fake dependencies that don't exist in fedora
./dependencies/./fake_ant_dependency.sh .m2/p2/repo-sdk/plugins/org.apache.ant_* %{_javadir} %{_bindir} -makejar
./dependencies/./fake_ant_dependency.sh .m2/p2/repo-sdk/plugins/org.apache.ant_* /usr/share/java /usr/bin -makejar
cp -r /usr/share/java/emf/eclipse/features/* .m2/p2/repo-sdk/features/
%{?scl: cp %{_javadir}/ecf/eclipse/plugins/* .m2/p2/repo-sdk/plugins}
sed -i -e 's@>org.eclipse.jdt<@>org.eclipse.tycho<@' eclipse-platform-parent/pom.xml
sed -i -e 's@!long@long@' eclipse-platform-parent/pom.xml
@ -513,8 +514,8 @@ dependencies/./replace_platform_plugins_with_symlinks.sh \
eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse %{_javadir}
#ant again
./dependencies/./fake_ant_dependency.sh \
eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse/plugins/org.apache.ant_* %{_javadir} \
%{_bindir}
eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse/plugins/org.apache.ant_* /usr/share/java \
/usr/bin
# JDT and PDE are built as update sites.
# Initialize them and move into dropins.
@ -1010,6 +1011,9 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
* Thu Mar 21 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.28.git38f1df9
- Properly symlink ant dependencies.
* Mon Mar 18 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.27.git38f1df9
- Build against jetty 8 in sclized version.