From da583bb911d50d85245a7d2602f0b9293246a559 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Wed, 1 Aug 2018 17:32:52 +0100
Subject: [PATCH] Fixes rhbz#1609422 - Packaging problem with Fedora Eclipse
 group

This group is way out of date and does not reflect current package
names and mentions packages that have been retired. This group is
not even installable on F28.

This change modernises the Eclipse group considerably.

Signed-off-by: Mat Booth <mat.booth@redhat.com>
---
 comps-f28.xml.in | 71 +++++++++++++++++++++++++++++++++++++++---------
 comps-f29.xml.in | 71 +++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 116 insertions(+), 26 deletions(-)

diff --git a/comps-f28.xml.in b/comps-f28.xml.in
index 65c0f8e1..02712877 100644
--- a/comps-f28.xml.in
+++ b/comps-f28.xml.in
@@ -1257,38 +1257,83 @@
     <packagelist>
       <packagereq type="mandatory">eclipse-cdt</packagereq>
       <packagereq type="mandatory">eclipse-jdt</packagereq>
-      <packagereq type="default">eclipse-changelog</packagereq>
-      <packagereq type="default">eclipse-collabnet-merge</packagereq>
-      <packagereq type="default">eclipse-dtp</packagereq>
+      <packagereq type="default">eclipse-abrt</packagereq>
+      <packagereq type="default">eclipse-cdt-docker</packagereq>
+      <packagereq type="default">eclipse-dltk-mylyn</packagereq>
+      <packagereq type="default">eclipse-dltk-sh</packagereq>
+      <packagereq type="default">eclipse-egit-github</packagereq>
+      <packagereq type="default">eclipse-egit-mylyn</packagereq>
       <packagereq type="default">eclipse-egit</packagereq>
-      <packagereq type="default">eclipse-fedorapackager</packagereq>
+      <packagereq type="default">eclipse-epp-logging</packagereq>
+      <packagereq type="default">eclipse-linuxtools-changelog</packagereq>
+      <packagereq type="default">eclipse-linuxtools-docker</packagereq>
+      <packagereq type="default">eclipse-linuxtools-gcov</packagereq>
+      <packagereq type="default">eclipse-linuxtools-gprof</packagereq>
+      <packagereq type="default">eclipse-linuxtools-javadocs</packagereq>
+      <packagereq type="default">eclipse-linuxtools-libhover</packagereq>
+      <packagereq type="default">eclipse-linuxtools-oprofile</packagereq>
+      <packagereq type="default">eclipse-linuxtools-perf</packagereq>
+      <packagereq type="default">eclipse-linuxtools-rpm-editor</packagereq>
+      <packagereq type="default">eclipse-linuxtools-systemtap</packagereq>
+      <packagereq type="default">eclipse-linuxtools-vagrant</packagereq>
+      <packagereq type="default">eclipse-linuxtools-valgrind</packagereq>
       <packagereq type="default">eclipse-mpc</packagereq>
-      <packagereq type="default">eclipse-mylyn</packagereq>
       <packagereq type="default">eclipse-mylyn-context-cdt</packagereq>
       <packagereq type="default">eclipse-mylyn-context-java</packagereq>
+      <packagereq type="default">eclipse-mylyn-context-pde</packagereq>
       <packagereq type="default">eclipse-mylyn-tasks-bugzilla</packagereq>
       <packagereq type="default">eclipse-mylyn-tasks-trac</packagereq>
       <packagereq type="default">eclipse-mylyn-tasks-web</packagereq>
-      <packagereq type="default">eclipse-oprofile</packagereq>
+      <packagereq type="default">eclipse-mylyn-versions-cvs</packagereq>
+      <packagereq type="default">eclipse-mylyn-versions-git</packagereq>
+      <packagereq type="default">eclipse-mylyn-versions-subclipse</packagereq>
       <packagereq type="default">eclipse-packagekit</packagereq>
       <packagereq type="default">eclipse-pde</packagereq>
+      <packagereq type="default">eclipse-pydev-mylyn</packagereq>
       <packagereq type="default">eclipse-pydev</packagereq>
-      <packagereq type="default">eclipse-rpm-editor</packagereq>
+      <packagereq type="default">eclipse-recommenders</packagereq>
       <packagereq type="default">eclipse-subclipse</packagereq>
-      <packagereq type="default">eclipse-valgrind</packagereq>
+      <packagereq type="default">eclipse-usage</packagereq>
+      <packagereq type="optional">eclipse-anyedit</packagereq>
+      <packagereq type="optional">eclipse-avr</packagereq>
+      <packagereq type="optional">eclipse-cdt-arduino</packagereq>
+      <packagereq type="optional">eclipse-cdt-llvm</packagereq>
+      <packagereq type="optional">eclipse-cdt-parsers</packagereq>
+      <packagereq type="optional">eclipse-cdt-qt</packagereq>
+      <packagereq type="optional">eclipse-checkstyle</packagereq>
+      <packagereq type="optional">eclipse-color-theme</packagereq>
       <packagereq type="optional">eclipse-dltk-ruby</packagereq>
       <packagereq type="optional">eclipse-dltk-tcl</packagereq>
+      <packagereq type="optional">eclipse-dtp</packagereq>
       <packagereq type="optional">eclipse-eclemma</packagereq>
       <packagereq type="optional">eclipse-epic</packagereq>
       <packagereq type="optional">eclipse-findbugs</packagereq>
+      <packagereq type="optional">eclipse-m2e-antlr</packagereq>
+      <packagereq type="optional">eclipse-m2e-apt</packagereq>
+      <packagereq type="optional">eclipse-m2e-buildhelper</packagereq>
+      <packagereq type="optional">eclipse-m2e-core</packagereq>
+      <packagereq type="optional">eclipse-m2e-cxf</packagereq>
+      <packagereq type="optional">eclipse-m2e-egit</packagereq>
+      <packagereq type="optional">eclipse-m2e-mavenarchiver</packagereq>
+      <packagereq type="optional">eclipse-m2e-maven-dependency-plugin</packagereq>
+      <packagereq type="optional">eclipse-m2e-mavendev</packagereq>
+      <packagereq type="optional">eclipse-m2e-modello</packagereq>
+      <packagereq type="optional">eclipse-m2e-plexus</packagereq>
+      <packagereq type="optional">eclipse-m2e-sisu</packagereq>
+      <packagereq type="optional">eclipse-m2e-sourcelookup</packagereq>
+      <packagereq type="optional">eclipse-m2e-takari</packagereq>
+      <packagereq type="optional">eclipse-m2e-tycho</packagereq>
+      <packagereq type="optional">eclipse-m2e-wtp</packagereq>
       <packagereq type="optional">eclipse-moreunit</packagereq>
-      <packagereq type="optional">eclipse-mylyn-fedora-integration</packagereq>
+      <packagereq type="optional">eclipse-mylyn-builds-hudson</packagereq>
+      <packagereq type="optional">eclipse-pdt</packagereq>
       <packagereq type="optional">eclipse-photran</packagereq>
       <packagereq type="optional">eclipse-quickrex</packagereq>
-      <packagereq type="optional">eclipse-rpmstubby</packagereq>
-      <packagereq type="optional">eclipse-shelled</packagereq>
-      <packagereq type="optional">eclipse-texlipse</packagereq>
-      <packagereq type="optional">eclipse-veditor</packagereq>
+      <packagereq type="optional">eclipse-testng</packagereq>
+      <packagereq type="optional">eclipse-webtools-dali</packagereq>
+      <packagereq type="optional">eclipse-webtools-javaee</packagereq>
+      <packagereq type="optional">eclipse-webtools-servertools</packagereq>
+      <packagereq type="optional">eclipse-webtools-sourceediting</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps-f29.xml.in b/comps-f29.xml.in
index 8fb828a2..4353609d 100644
--- a/comps-f29.xml.in
+++ b/comps-f29.xml.in
@@ -1256,38 +1256,83 @@
     <packagelist>
       <packagereq type="mandatory">eclipse-cdt</packagereq>
       <packagereq type="mandatory">eclipse-jdt</packagereq>
-      <packagereq type="default">eclipse-changelog</packagereq>
-      <packagereq type="default">eclipse-collabnet-merge</packagereq>
-      <packagereq type="default">eclipse-dtp</packagereq>
+      <packagereq type="default">eclipse-abrt</packagereq>
+      <packagereq type="default">eclipse-cdt-docker</packagereq>
+      <packagereq type="default">eclipse-dltk-mylyn</packagereq>
+      <packagereq type="default">eclipse-dltk-sh</packagereq>
+      <packagereq type="default">eclipse-egit-github</packagereq>
+      <packagereq type="default">eclipse-egit-mylyn</packagereq>
       <packagereq type="default">eclipse-egit</packagereq>
-      <packagereq type="default">eclipse-fedorapackager</packagereq>
+      <packagereq type="default">eclipse-epp-logging</packagereq>
+      <packagereq type="default">eclipse-linuxtools-changelog</packagereq>
+      <packagereq type="default">eclipse-linuxtools-docker</packagereq>
+      <packagereq type="default">eclipse-linuxtools-gcov</packagereq>
+      <packagereq type="default">eclipse-linuxtools-gprof</packagereq>
+      <packagereq type="default">eclipse-linuxtools-javadocs</packagereq>
+      <packagereq type="default">eclipse-linuxtools-libhover</packagereq>
+      <packagereq type="default">eclipse-linuxtools-oprofile</packagereq>
+      <packagereq type="default">eclipse-linuxtools-perf</packagereq>
+      <packagereq type="default">eclipse-linuxtools-rpm-editor</packagereq>
+      <packagereq type="default">eclipse-linuxtools-systemtap</packagereq>
+      <packagereq type="default">eclipse-linuxtools-vagrant</packagereq>
+      <packagereq type="default">eclipse-linuxtools-valgrind</packagereq>
       <packagereq type="default">eclipse-mpc</packagereq>
-      <packagereq type="default">eclipse-mylyn</packagereq>
       <packagereq type="default">eclipse-mylyn-context-cdt</packagereq>
       <packagereq type="default">eclipse-mylyn-context-java</packagereq>
+      <packagereq type="default">eclipse-mylyn-context-pde</packagereq>
       <packagereq type="default">eclipse-mylyn-tasks-bugzilla</packagereq>
       <packagereq type="default">eclipse-mylyn-tasks-trac</packagereq>
       <packagereq type="default">eclipse-mylyn-tasks-web</packagereq>
-      <packagereq type="default">eclipse-oprofile</packagereq>
+      <packagereq type="default">eclipse-mylyn-versions-cvs</packagereq>
+      <packagereq type="default">eclipse-mylyn-versions-git</packagereq>
+      <packagereq type="default">eclipse-mylyn-versions-subclipse</packagereq>
       <packagereq type="default">eclipse-packagekit</packagereq>
       <packagereq type="default">eclipse-pde</packagereq>
+      <packagereq type="default">eclipse-pydev-mylyn</packagereq>
       <packagereq type="default">eclipse-pydev</packagereq>
-      <packagereq type="default">eclipse-rpm-editor</packagereq>
+      <packagereq type="default">eclipse-recommenders</packagereq>
       <packagereq type="default">eclipse-subclipse</packagereq>
-      <packagereq type="default">eclipse-valgrind</packagereq>
+      <packagereq type="default">eclipse-usage</packagereq>
+      <packagereq type="optional">eclipse-anyedit</packagereq>
+      <packagereq type="optional">eclipse-avr</packagereq>
+      <packagereq type="optional">eclipse-cdt-arduino</packagereq>
+      <packagereq type="optional">eclipse-cdt-llvm</packagereq>
+      <packagereq type="optional">eclipse-cdt-parsers</packagereq>
+      <packagereq type="optional">eclipse-cdt-qt</packagereq>
+      <packagereq type="optional">eclipse-checkstyle</packagereq>
+      <packagereq type="optional">eclipse-color-theme</packagereq>
       <packagereq type="optional">eclipse-dltk-ruby</packagereq>
       <packagereq type="optional">eclipse-dltk-tcl</packagereq>
+      <packagereq type="optional">eclipse-dtp</packagereq>
       <packagereq type="optional">eclipse-eclemma</packagereq>
       <packagereq type="optional">eclipse-epic</packagereq>
       <packagereq type="optional">eclipse-findbugs</packagereq>
+      <packagereq type="optional">eclipse-m2e-antlr</packagereq>
+      <packagereq type="optional">eclipse-m2e-apt</packagereq>
+      <packagereq type="optional">eclipse-m2e-buildhelper</packagereq>
+      <packagereq type="optional">eclipse-m2e-core</packagereq>
+      <packagereq type="optional">eclipse-m2e-cxf</packagereq>
+      <packagereq type="optional">eclipse-m2e-egit</packagereq>
+      <packagereq type="optional">eclipse-m2e-mavenarchiver</packagereq>
+      <packagereq type="optional">eclipse-m2e-maven-dependency-plugin</packagereq>
+      <packagereq type="optional">eclipse-m2e-mavendev</packagereq>
+      <packagereq type="optional">eclipse-m2e-modello</packagereq>
+      <packagereq type="optional">eclipse-m2e-plexus</packagereq>
+      <packagereq type="optional">eclipse-m2e-sisu</packagereq>
+      <packagereq type="optional">eclipse-m2e-sourcelookup</packagereq>
+      <packagereq type="optional">eclipse-m2e-takari</packagereq>
+      <packagereq type="optional">eclipse-m2e-tycho</packagereq>
+      <packagereq type="optional">eclipse-m2e-wtp</packagereq>
       <packagereq type="optional">eclipse-moreunit</packagereq>
-      <packagereq type="optional">eclipse-mylyn-fedora-integration</packagereq>
+      <packagereq type="optional">eclipse-mylyn-builds-hudson</packagereq>
+      <packagereq type="optional">eclipse-pdt</packagereq>
       <packagereq type="optional">eclipse-photran</packagereq>
       <packagereq type="optional">eclipse-quickrex</packagereq>
-      <packagereq type="optional">eclipse-rpmstubby</packagereq>
-      <packagereq type="optional">eclipse-shelled</packagereq>
-      <packagereq type="optional">eclipse-texlipse</packagereq>
-      <packagereq type="optional">eclipse-veditor</packagereq>
+      <packagereq type="optional">eclipse-testng</packagereq>
+      <packagereq type="optional">eclipse-webtools-dali</packagereq>
+      <packagereq type="optional">eclipse-webtools-javaee</packagereq>
+      <packagereq type="optional">eclipse-webtools-servertools</packagereq>
+      <packagereq type="optional">eclipse-webtools-sourceediting</packagereq>
     </packagelist>
   </group>
   <group>