From 149f51c3dcb9f7fb3d3d26d161102c70d833cbae Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Sep 12 2016 19:05:09 +0000
Subject: Break cycle from main CDT package to the SDK.


org.eclipse.cdt.launch.remote.feature is under the main CDT package and
its feature depends on org.eclipse.cdt.launch.remote.source. But all
source bundles are under the SDK package so this creates a cycle. Break
the cycle by removing the requirement from the feature.

---

diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 5e32ca4..940edf4 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -37,7 +37,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -286,6 +286,9 @@ sed -i -e 's/org.freemarker/org.freemarker.freemarker/' \
 # Drop unnecessary dep on log4j
 sed -i -e '/log4j/d' build/org.eclipse.cdt.autotools.ui.tests/META-INF/MANIFEST.MF
 
+# Remove org.eclipse.cdt.launch.remote.source to prevent cycle back to SDK
+%pom_xpath_remove "plugin[@id='org.eclipse.cdt.launch.remote.source']" cross/org.eclipse.cdt.launch.remote-feature/feature.xml
+
 %mvn_package "::pom::" __noinstall
 %mvn_package ::jar:sources: sdk
 %mvn_package ":*.source{,.feature}" sdk
@@ -427,6 +430,9 @@ cp man/cdtdebug.man $manInstallDir/cdtdebug.1
 %endif
 
 %changelog
+* Mon Sep 12 2016 Roland Grunberg <rgrunber@redhat.com> - 1:9.0.0-2
+- Break cycle from main CDT package to the SDK.
+
 * Wed Jun 22 2016 Mat Booth <mat.booth@redhat.com> - 1:9.0.0-1
 - Update to Neon release