From 4d5c7c014c8cd94d1b3496661a4d6ec072a68582 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Sun, 2 Jun 2019 15:06:51 +0100
Subject: [PATCH] Add eclipse-ptp and build against tycho 1.4

---
 clone_rpms.sh | 17 +++++++++++++++++
 eclipse.yaml  | 45 ++++++++++++++++++++++++++-------------------
 2 files changed, 43 insertions(+), 19 deletions(-)
 create mode 100755 clone_rpms.sh

diff --git a/clone_rpms.sh b/clone_rpms.sh
new file mode 100755
index 0000000..08c839a
--- /dev/null
+++ b/clone_rpms.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+script_location=$( (cd $(dirname $0) && pwd) )
+
+module=$(basename $script_location`)
+
+mkdir -p rpms
+pushd rpms 2>&1 >/dev/null
+
+for pkg in $(grep -B1 --no-group-separator buildorder ../$module.yaml | grep -v buildorder | sed -e 's/:$//') ; do
+	if [ ! -d "$pkg" ] ; then
+		fedpkg clone $pkg
+		(cd $pkg ; fedpkg switch-branch master ; fedpkg switch-branch $module)
+	fi
+done
+
+popd 2>&1 >/dev/null
diff --git a/eclipse.yaml b/eclipse.yaml
index 1d9181e..2857f93 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -12,7 +12,7 @@ data:
             - MIT
     dependencies:
         - buildrequires:
-              tycho: [1.3]
+              tycho: [1.4]
               platform: []
           requires:
               ant: [1.10]
@@ -44,11 +44,6 @@ data:
             - eclipse-subclipse
             - eclipse-tm-terminal
             - eclipse-usage
-            - freemarker
-            - glassfish-jaxb-runtime
-            - nekohtml
-            - rxtx
-            - swt-chart
     filter:
         rpms:
             - antlr32-javadoc
@@ -71,8 +66,6 @@ data:
             - batik-svgpp
             - batik-ttf2svg
             - bouncycastle-javadoc
-            - bouncycastle-mail
-            - bouncycastle-tls
             - eclipse-cdt
             - eclipse-cdt-arduino
             - eclipse-cdt-docker
@@ -125,7 +118,6 @@ data:
             - glassfish-jaxb-txw-parent
             - glassfish-jaxb-txwc2
             - glassfish-jaxb-xjc
-            - glassfish-jaxb1-impl
             - glassfish-jsp-api-javadoc
             - glassfish-jsp-javadoc
             - glassfish-servlet-api-javadoc
@@ -339,7 +331,8 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-remote.
+                    Runtime dependency of eclipse-photran, eclipse-ptp,
+                         eclipse-remote.
             eclipse-dtp:
                 buildorder: 20
                 ref: eclipse
@@ -381,7 +374,7 @@ data:
                 rationale: >
                     Module API.
                     Runtime dependency of eclipse-egit,
-                         eclipse-egit-github.
+                         eclipse-egit-github, eclipse-ptp.
             eclipse-launchbar:
                 buildorder: 10
                 ref: eclipse
@@ -402,6 +395,20 @@ data:
                     Runtime dependency of eclipse-abrt, eclipse-egit,
                          eclipse-egit-github, eclipse-epp-logging,
                          eclipse-subclipse.
+            eclipse-photran:
+                buildorder: 70
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
+                    Runtime dependency of eclipse-ptp.
+            eclipse-ptp:
+                buildorder: 80
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
+                    Runtime dependency of eclipse-linuxtools.
             eclipse-pydev:
                 buildorder: 50
                 ref: eclipse
@@ -413,7 +420,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-launchbar.
+                    Runtime dependency of eclipse-launchbar, eclipse-ptp.
             eclipse-subclipse:
                 buildorder: 50
                 ref: eclipse
@@ -426,7 +433,7 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-remote.
+                    Runtime dependency of eclipse-ptp, eclipse-remote.
             eclipse-usage:
                 buildorder: 50
                 ref: eclipse
@@ -466,7 +473,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Module API.
+                    Runtime dependency of eclipse-cdt.
             glassfish-annotation-api:
                 buildorder: 10
                 ref: eclipse
@@ -477,7 +484,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Module API.
+                    Runtime dependency of eclipse-cdt, eclipse-ptp.
             glassfish-jaxb-api:
                 buildorder: 10
                 ref: eclipse
@@ -629,7 +636,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-dtp.
+                    Runtime dependency of eclipse-cdt, eclipse-dtp.
             lucene:
                 buildorder: 10
                 ref: eclipse
@@ -641,7 +648,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Module API.
+                    Runtime dependency of eclipse-linuxtools.
             netty:
                 buildorder: 30
                 ref: eclipse
@@ -659,7 +666,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Module API.
+                    Runtime dependency of eclipse-tm-terminal.
             sac:
                 buildorder: 10
                 ref: eclipse
@@ -705,7 +712,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Module API.
+                    Runtime dependency of eclipse-linuxtools.
             trilead-ssh2:
                 buildorder: 10
                 ref: eclipse