diff --git a/eclipse.spec b/eclipse.spec index 7bef190..4da9e2f 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -38,7 +38,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.7.0 -Release: 0.9%{?dist} +Release: 0.10%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -189,7 +189,7 @@ BuildRequires: xml-commons-apis BuildRequires: atinject BuildRequires: atinject-tck BuildRequires: eclipse-filesystem -BuildRequires: eclipse-ecf-core >= 3.13.3-1 +BuildRequires: eclipse-ecf-core >= 3.13.6-1 BuildRequires: eclipse-emf-core >= 1:2.12.0-1 BuildRequires: eclipse-license BuildRequires: glassfish-el-api >= 3.0.1 @@ -275,7 +275,7 @@ Requires: sac Requires: batik-css Requires: xml-commons-apis Requires: atinject -Requires: eclipse-ecf-core >= 3.13.3-1 +Requires: eclipse-ecf-core >= 3.13.6-1 Requires: eclipse-emf-core >= 1:2.12.0-1 Requires: glassfish-el-api >= 3.0.1 Requires: glassfish-el >= 3.0.1 @@ -295,6 +295,13 @@ Requires: ant >= 1.9.6 Requires: osgi(org.tukaani.xz) %endif +# Provides/obsoletes added in F26 +# This is the best place to add this because adding it to the nls RPMs causes every +# single language pack to be installed, which is not desireable -- it needs to be +# obsoleted by exactly one thing. +Provides: eclipse-nls = %{version}-%{release} +Obsoletes: eclipse-nls < %{version}-%{release} + %description platform The Eclipse Platform is the base of all IDE plugins. This does not include the Java Development Tools or the Plugin Development Environment. @@ -544,6 +551,9 @@ sed -i -e '/<\/excludes>/i' \ %pom_xpath_inject "feature" '' eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml %pom_xpath_inject "feature" '' eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +# Prevent dep cycle +%pom_xpath_remove "plugin[@id='org.eclipse.core.tests.harness']" eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml + # Include maven descriptors to allow our test execution setup to work %pom_xpath_set "pom:plugin[pom:artifactId = 'tycho-packaging-plugin']/pom:configuration/pom:archive/pom:addMavenDescriptor" "true" eclipse-platform-parent @@ -1037,6 +1047,11 @@ fi %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Tue May 09 2017 Mat Booth - 1:4.7.0-0.10 +- Rebuild for new ECF +- Obsolete core NLS package +- Fix cycle introduced between tests and contributor-tools + * Sat May 06 2017 Mat Booth - 1:4.7.0-0.9 - Fix build against new felix-gogo - Update to latest I-build