diff --git a/eclipse.spec b/eclipse.spec index 5d1e52d..d4f6baf 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -13,7 +13,7 @@ Epoch: 1 %global eclipse_major 4 %global eclipse_minor 4 %global eclipse_micro 0 -%global eb_commit 27d9371a79744f02da09de58db140256a6a9b9e7 +%global eb_commit 93cece6ca02e022b0d8d0816a9f6596b311ab774 %global eclipse_tag R4_4 %global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro} %global _jetty_version 9.2.1 @@ -39,7 +39,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 1%{?dist} +Release: 2%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -720,7 +720,7 @@ sed -i 's|\.\+/\(prepAllTestBundles\.sh\)|%{_javadir}/eclipse-testing/testbundle sed -i 's|cp swtbot-library.xml alltest.xml updateTestBundleXML.sh target/|cp %{_javadir}/eclipse-testing/testbundle/{swtbot-library.xml,alltest.xml,updateTestBundleXML.sh} target/|' prepRuntimeLocation.sh for file in genRepo.sh gatherBundles.sh ;do - sed -i '/prefix=\$ROOT_PREFIX/ i ROOT_PREFIX=%{_scl_root}' ${file} + sed -i 's/scl_root=/scl_root=%{_scl_root}/' ${file} done mv $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle/%{pkg_name}-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runTestBundles @@ -993,6 +993,9 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Thu Jun 26 2014 Roland Grunberg - 1:4.4.0-2 +- Update eclipse-build with improvements to bundle testing. + * Wed Jun 25 2014 Mat Booth - 1:4.4.0-1 - Update to final Luna release - Rebuild against newer dependencies diff --git a/sources b/sources index afdfe75..40f2e30 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d1e37d9af6848edbdd54d5988c77fa58 R4_platform-aggregator-R4_4.tar.xz -6e6b220b067ce4c6ed6e74d302f920c8 org.eclipse.linuxtools.eclipse-build-27d9371a79744f02da09de58db140256a6a9b9e7.tar.bz2 +4b0e52cd5be2ce73b6f41d90993bc366 org.eclipse.linuxtools.eclipse-build-93cece6ca02e022b0d8d0816a9f6596b311ab774.tar.bz2