Update to Neon.2

Bootstrap build due to ant update
Port to new ant version
Rebuild for ECF update
Pull in usage plugin by default

eclipse.spec

@@ -35,6 +35,10 @@ Epoch:                  1
     %global eclipse_arch %{_arch}
 %endif
 
+# Desktop file information
+%global app_name %{?app_name_prefix} Eclipse
+%global app_exec %{?app_exec_prefix} eclipse
+
 # See fedora-devel-java-list discussion in September 2008.
 #
 # Prevent brp-java-repack-jars from being run.
@@ -724,8 +728,8 @@ ln -s /usr/share/icons/hicolor/256x256/apps/%{name}.png \
     $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}.png
 
 # Install desktop file
-%{?scl: sed -i -e 's/Exec=eclipse/Exec=scl enable %{scl_name} eclipse/g' desktopintegration/eclipse.desktop}
-%{?scl: sed -i -e 's/Name=Eclipse/Name=DTS Eclipse/g' desktopintegration/eclipse.desktop}
+sed -i -e 's/Exec=eclipse/Exec=%{app_exec}/g' desktopintegration/eclipse.desktop
+sed -i -e 's/Name=Eclipse/Name=%{app_name}/g' desktopintegration/eclipse.desktop
 sed -i -e 's/Icon=eclipse/Icon=%{name}/g' desktopintegration/eclipse.desktop
 install -m644 -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
 desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
@@ -890,7 +894,7 @@ find $RPM_BUILD_ROOT/%{_libdir}/eclipse -name *.so -exec chmod a+x {} \;
 
 # Usage marker
 install -d -m 755 %{buildroot}%{_libdir}/eclipse/.pkgs
-echo "%{version}-%{release}" > %{buildroot}%{_libdir}/eclipse/.pkgs/Distro-%{?dist}
+echo "%{version}-%{release}" > %{buildroot}%{_libdir}/eclipse/.pkgs/Distro%{?dist}
 
 %post platform
 touch --no-create /usr/share/icons/hicolor
@@ -912,7 +916,8 @@ fi
 
 %files platform -f .mfiles-platform
 %{_bindir}/eclipse
-%{_libdir}/%{name}/.eclipseproduct
+%{_libdir}/eclipse/.eclipseproduct
+%{_libdir}/eclipse/.pkgs
 %config %{_libdir}/%{name}/eclipse.ini
 %config %{_sysconfdir}/eclipse.ini
 /usr/share/applications/*