From feb4db63a96e05b2a14f8f898f5bbf7421d99578 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Oct 17 2018 04:04:36 +0000
Subject: Reboot build of eclipse-cdt


- remove a number of plug-ins that now rely on
  eclipse-launchbar which requires eclipse-remote
  and the plug-ins/features that use them

---

diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 5bc7efa..be3afba 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -44,7 +44,7 @@ Epoch: 2
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        9.5.3
-Release:        4.1%{?dist}
+Release:        4.2%{?dist}
 License:        EPL-1.0 and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -76,7 +76,6 @@ Patch4: eclipse-cdt-cdtdebug.patch2
 # Remove invalid configurations used when building standalone debugger
 Patch5: eclipse-cdt-standalone.patch
 
-%if 0
 BuildRequires: make
 BuildRequires: rsync
 BuildRequires: gcc-c++
@@ -90,7 +89,6 @@ BuildRequires: eclipse-platform
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-contributor-tools
 BuildRequires: eclipse-swtbot >= 2.4.0
-BuildRequires: eclipse-launchbar >= 1:2.2.0
 BuildRequires: eclipse-tm-terminal
 BuildRequires: exec-maven-plugin
 BuildRequires: maven-antrun-plugin
@@ -100,10 +98,10 @@ BuildRequires: mockito
 %if %{_enable_container_support}
 BuildRequires: eclipse-linuxtools-docker >= 5.3.0
 %endif
+BuildRequires: eclipse-launchbar >= 1:2.2.0
 BuildRequires: eclipse-remote >= 2.1.0
 BuildRequires: eclipse-tm-terminal-connectors >= 4.3.0
 %endif
-%endif
 
 Requires:      gdb make gcc-c++
 Requires:      hamcrest
@@ -127,7 +125,6 @@ Summary:        Eclipse C/C++ Development Tools (CDT) Natives
 %description native
 Architecture specific parts of CDT.
 
-%if 0
 %package parsers
 Summary:        Eclipse C/C++ Development Tools (CDT) Optional Parsers
 Requires:       %{name} = %{epoch}:%{version}-%{release}
@@ -211,7 +208,6 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description sdk
 Source for Eclipse CDT for use within Eclipse.
-%endif
 
 %prep
 %setup -q -n %{cdt_snapshot}
@@ -224,7 +220,6 @@ cp %{SOURCE3} desktop
 mkdir man
 cp %{SOURCE4} man
 
-%if 0
 %patch1 -p0
 %patch2 -p0
 %patch3 -p1
@@ -327,11 +322,53 @@ mkdir -p native/org.eclipse.cdt.native.serial/os/linux/%{eclipse_arch} \
 %pom_disable_module build/org.eclipse.cdt.cmake.ui
 %pom_disable_module build/org.eclipse.cdt.cmake-feature
 %pom_disable_module build/org.eclipse.cdt.cmake.ui.tests
+%pom_disable_module build/org.eclipse.cdt.make.ui
+%pom_disable_module build/org.eclipse.cdt.managedbuilder.ui
+%pom_disable_module debug/org.eclipse.cdt.debug.core
+%pom_disable_module debug/org.eclipse.cdt.debug.ui
+%pom_disable_module debug/org.eclipse.cdt.gdb.ui
+%pom_disable_module debug/org.eclipse.cdt.gdb-feature
+%pom_disable_module debug/org.eclipse.cdt.gnu.debug-feature
+%pom_disable_module debug/org.eclipse.cdt.debug.application
+%pom_disable_module debug/org.eclipse.cdt.debug.application.product
+%pom_disable_module debug/org.eclipse.cdt.debug.standalone-feature
+%pom_disable_module dsf/org.eclipse.cdt.dsf
+%pom_disable_module dsf/org.eclipse.cdt.dsf.ui
+%pom_disable_module dsf-gdb/org.eclipse.cdt.dsf.gdb
+%pom_disable_module dsf-gdb/org.eclipse.cdt.dsf.gdb.ui
+%pom_disable_module dsf-gdb/org.eclipse.cdt.gnu.dsf-feature
+%pom_disable_module dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature
+%pom_disable_module dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui
+%pom_disable_module llvm/org.eclipse.cdt.llvm.dsf.lldb.core
+%pom_disable_module llvm/org.eclipse.cdt.llvm.dsf.lldb-feature
+%pom_disable_module llvm/org.eclipse.cdt.llvm.dsf.lldb.ui
+%pom_disable_module jtag/org.eclipse.cdt.debug.gdbjtag
+%pom_disable_module jtag/org.eclipse.cdt.debug.gdbjtag.core
+%pom_disable_module jtag/org.eclipse.cdt.debug.gdbjtag.ui
+%pom_disable_module jtag/org.eclipse.cdt.debug.gdbjtag-feature
+%pom_disable_module memory/org.eclipse.cdt.debug.ui.memory-feature
+%pom_disable_module memory/org.eclipse.cdt.debug.ui.memory.floatingpoint
+%pom_disable_module memory/org.eclipse.cdt.debug.ui.memory.memorybrowser
+%pom_disable_module memory/org.eclipse.cdt.debug.ui.memory.search
+%pom_disable_module memory/org.eclipse.cdt.debug.ui.memory.traditional
+%pom_disable_module memory/org.eclipse.cdt.debug.ui.memory.transport
+%pom_disable_module testsrunner/org.eclipse.cdt.testsrunner
+%pom_disable_module testsrunner/org.eclipse.cdt.testsrunner.qttest
+%pom_disable_module testsrunner/org.eclipse.cdt.testsrunner.boost
+%pom_disable_module testsrunner/org.eclipse.cdt.testsrunner.tap
+%pom_disable_module testsrunner/org.eclipse.cdt.testsrunner.feature
+%pom_disable_module testsrunner/org.eclipse.cdt.testsrunner.gtest
+%pom_disable_module visualizer/org.eclipse.cdt.visualizer.core
+%pom_disable_module visualizer/org.eclipse.cdt.visualizer.ui
+%pom_disable_module visualizer/org.eclipse.cdt.visualizer-feature
+%pom_disable_module cross/org.eclipse.cdt.build.crossgcc-feature
+%pom_disable_module cross/org.eclipse.cdt.build.crossgcc
 %pom_disable_module cross/org.eclipse.cdt.launch.remote
 %pom_disable_module cross/org.eclipse.cdt.launch.remote-feature
 %pom_disable_module cross/org.eclipse.cdt.launch.serial.core
 %pom_disable_module cross/org.eclipse.cdt.launch.serial.ui
 %pom_disable_module cross/org.eclipse.cdt.launch.serial-feature
+%pom_disable_module launch/org.eclipse.cdt.launch
 %pom_disable_module remote/org.eclipse.cdt.remote.core
 %pom_disable_module qt/org.eclipse.cdt.qt.core
 %pom_disable_module qt/org.eclipse.cdt.qt.ui
@@ -340,6 +377,34 @@ mkdir -p native/org.eclipse.cdt.native.serial/os/linux/%{eclipse_arch} \
 %pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.core
 %pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.ui
 %pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino-feature
+%pom_disable_module xlc/org.eclipse.cdt.xlc.feature
+%pom_disable_module xlc/org.eclipse.cdt.xlc.sdk-feature
+%pom_disable_module xlc/org.eclipse.cdt.make.xlc.core
+%pom_disable_module xlc/org.eclipse.cdt.core.lrparser.xlc
+%pom_disable_module xlc/org.eclipse.cdt.errorparsers.xlc
+%pom_disable_module xlc/org.eclipse.cdt.managedbuilder.xlc.ui
+%pom_disable_module xlc/org.eclipse.cdt.managedbuilder.xlc.core
+%pom_disable_module xlc/org.eclipse.cdt.managedbuilder.xlupc.ui
+%pom_disable_module releng/org.eclipse.cdt
+%pom_disable_module releng/org.eclipse.cdt.platform-feature
+%pom_disable_module releng/org.eclipse.cdt-feature
+%pom_disable_module releng/org.eclipse.cdt.sdk
+%pom_disable_module releng/org.eclipse.cdt.sdk-feature
+%pom_disable_module build/org.eclipse.cdt.managedbuilder.core.tests
+%pom_disable_module build/org.eclipse.cdt.managedbuilder.ui.tests
+%pom_disable_module build/org.eclipse.cdt.make.core.tests
+%pom_disable_module build/org.eclipse.cdt.make.ui.tests
+%pom_disable_module codan/org.eclipse.cdt.codan.core.tests
+%pom_disable_module codan/org.eclipse.cdt.codan.checkers.ui.tests
+%pom_disable_module core/org.eclipse.cdt.core.tests
+%pom_disable_module core/org.eclipse.cdt.ui.tests
+%pom_disable_module dsf-gdb/org.eclipse.cdt.dsf.gdb.tests
+%pom_disable_module dsf-gdb/org.eclipse.cdt.tests.dsf.gdb
+%pom_disable_module dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests
+%pom_disable_module testsrunner/org.eclipse.cdt.testsrunner.tests
+%pom_disable_module xlc/org.eclipse.cdt.errorparsers.xlc.tests
+%pom_disable_module releng/org.eclipse.cdt.testing
+%pom_disable_module releng/org.eclipse.cdt.testing-feature
 %else
 %if ! %{_enable_container_support}
 %pom_disable_module launch/org.eclipse.cdt.docker.launcher
@@ -431,11 +496,8 @@ find core/org.eclipse.cdt.core.tests/resources -name *.a -delete
 %mvn_package :org.eclipse.cdt.cmake* qt
 %mvn_package :org.eclipse.cdt*
 
-%endif
-
 %build
 
-%if 0
 export JAVA_HOME=%{_jvmdir}/java
 
 export CFLAGS="${CFLAGS:-%__global_cflags}"
@@ -449,15 +511,15 @@ popd
 # Exclude EquinoxResolver to avoid NPE occuring on arm and increase memory for s390
 export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState"
 %mvn_build -j -f -- -Dtycho.local.keepTarget -Dnative=linux.%{eclipse_arch} -Pbuild-standalone-debugger-rcp
-%endif
 
 %install
-%if 0
 %mvn_install
 
 binInstallDir=${RPM_BUILD_ROOT}/%{_bindir}
 install -d -m755 $binInstallDir
 
+%if %{_enable_container_and_remote_support}
+
 libInstallDir=${RPM_BUILD_ROOT}/%{_cdtstandalonedir}
 install -d -m755 $libInstallDir
 
@@ -536,6 +598,8 @@ popd
 
 echo %{eclipse_base}/droplets/cdt/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION.jar >> .mfiles
 
+%endif
+
 # Install icons
 install -D debug/org.eclipse.cdt.debug.application/icons/cc32.png \
     $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/%{name}.png
@@ -558,14 +622,16 @@ sed -i -e 's|Name=Eclipse.*|Name=%{app_name}|g' desktop/eclipse-cdt.desktop
 sed -i -e "s|Icon=eclipse|Icon=%{name}|g" desktop/eclipse-cdt.desktop
 install -D desktop/eclipse-cdt.desktop $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
 desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
-%endif
 
 # Install man page
 install -D -m 644 man/cdtdebug.man $RPM_BUILD_ROOT/%{_mandir}/man1/cdtdebug.1
 
-%if 0
 # Remove uneeded extra symlinks that are optional deps of log4j:
+%if %{_enable_container_and_remote_support}
 sed -i -e '/mail/d' .mfiles* %{buildroot}/%{_datadir}/eclipse/droplets/*/fragment.info %{buildroot}/%{_datadir}/java/*/fragment.info
+%else
+sed -i -e '/mail/d' .mfiles*
+%endif
 rm -f %{buildroot}/%{_datadir}/eclipse/droplets/*/plugins/*mail* %{buildroot}/%{_datadir}/java/*/plugins/*mail*
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
@@ -582,18 +648,15 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
 fi
 %endif
 
-%endif
-
-%files
-%if 0
+%files -f .mfiles
+%if %{_enable_container_and_remote_support}
 %{_bindir}/cdtdebug
 %{_cdtstandalonedir}/*
+%endif
 /usr/share/applications/*
 /usr/share/pixmaps/*
 /usr/share/icons/*/*/apps/*
-%endif
 %{_mandir}/man1/cdtdebug.1*
-%if 0
 %doc releng/org.eclipse.cdt.sdk/epl-v10.html
 %doc releng/org.eclipse.cdt.sdk/notice.html
 
@@ -609,11 +672,15 @@ fi
 %doc releng/org.eclipse.cdt.sdk/epl-v10.html
 %doc releng/org.eclipse.cdt.sdk/notice.html
 
+%if %{_enable_container_and_remote_support}
+
 %files tests -f .mfiles-tests
 %{_bindir}/eclipse-runCDTTestBundles
 %doc releng/org.eclipse.cdt.sdk/epl-v10.html
 %doc releng/org.eclipse.cdt.sdk/notice.html
 
+%endif
+
 %files llvm -f .mfiles-llvm
 %doc releng/org.eclipse.cdt.sdk/epl-v10.html
 %doc releng/org.eclipse.cdt.sdk/notice.html
@@ -639,10 +706,8 @@ fi
 %endif
 %endif
 
-%endif
-
 %changelog
-* Tue Oct 16 2018 Jeff Johnston <jjohnstn@redhat.com> - 2:9.5.3-4.1
+* Tue Oct 16 2018 Jeff Johnston <jjohnstn@redhat.com> - 2:9.5.3-4.2
 - Bootstrap build removing provides/requires from standalone debugger
 
 * Tue Oct 09 2018 Jeff Johnston <jjohnstn@redhat.com> - 2:9.5.3-4