diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 0fe4472..8cf6fd3 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -41,7 +41,7 @@ Epoch: 2 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: 9.6.0 -Release: 2%{?dist} +Release: 3%{?dist} License: EPL-2.0 and CPL URL: http://www.eclipse.org/cdt @@ -116,6 +116,7 @@ Eclipse features and plugins that are useful for C and C++ development. %package native Summary: Eclipse C/C++ Development Tools (CDT) Natives +Requires: eclipse-platform %description native Architecture specific parts of CDT. @@ -468,15 +469,6 @@ sed -i -e 's/com.sun.xml.bind.v2/com.sun.xml.internal.bind.v2/' bundles/org.ecli # Avoid unnecessary dep on Java 11 sed -i -e 's/JavaSE-11/JavaSE-1.8/' bundles/org.eclipse.tools.templates.freemarker.java11/META-INF/MANIFEST.MF -# Don't package problematic test data -rm core/org.eclipse.cdt.core.tests/resources/testlib/x86/so.g/libtestlib_g.so -rm core/org.eclipse.cdt.core.tests/resources/exebig/x86/o.g/exebig_g -rm core/org.eclipse.cdt.core.tests/resources/exe/x86/o.g/exe_g -rm core/org.eclipse.cdt.core.tests/resources/exe/x86/o/exe -rm core/org.eclipse.cdt.core.tests/resources/exe/ppc/be.g/exe_g -find core/org.eclipse.cdt.core.tests/resources -name *.o -delete -find core/org.eclipse.cdt.core.tests/resources -name *.a -delete - %mvn_package "::pom::" __noinstall %mvn_package ":*.{testing,tests,tests.dsf,tests.dsf.gdb}" tests %mvn_package "::jar:sources{,-feature}:" sdk @@ -695,6 +687,9 @@ fi %endif %changelog +* Tue Jan 08 2019 Mat Booth - 2:9.6.0-3 +- Ensure the native subpackage brings in the Eclipse Platform package + * Mon Jan 07 2019 Mat Booth - 2:9.6.0-2 - Update to tagged sources and add patch for QT test runners problem - Fix some build issues