From a2fac2c5f68b6c23a72c6b889457f31d067e3730 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@fedoraproject.org>
Date: Jun 28 2010 19:02:40 +0000
Subject: * Mon Jun 28 2010 Jeff Johnston  <jjohnstn@redhat.com> 1:6.0.2-2

- Add back mylyn bridge since version of mylyn in F-12 does not have
  the CDT mylyn bridge in it.

---

diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 9f6a527..e8268d8 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -22,7 +22,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
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -108,14 +108,12 @@ Patch17: %{name}-ppc64-add_xopen_source-include.patch
 # in the plugin.
 Patch19: %{name}-autotools-local.patch
 
-# Disable mylyn bridge compiling. Should be removed when CDT 7.0 is out.
-Patch20: %{name}-disable-mylyn.patch
-
 # Add new setTargets interface to MakeTargetManager for use by Autotools.
 # This can be removed for CDT 7.0.
 Patch21: %{name}-maketargets.patch
 
 BuildRequires: eclipse-pde
+BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
 BuildRequires:  java-devel >= 1.4.2
 BuildRequires: lpg-java-compat
@@ -134,6 +132,15 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %description
 Eclipse features and plugins that are useful for C and C++ development.
 
+%package mylyn
+Summary:        Eclipse C/C++ Development Tools (CDT) SDK plugin
+Group:          Text Editors/Integrated Development Environments (IDE)
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       eclipse-mylyn >= 3.0
+
+%description mylyn
+Mylyn integration for CDT.
+
 %package parsers
 Summary:        Eclipse C/C++ Development Tools (CDT) SDK plugin
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -283,17 +290,13 @@ cd ../org.eclipse.cdt.core.linux
 popd
 %endif
 
-#remove mylyn plugins (part of mylyn srpm now)
-rm -fr results/plugins/org.eclipse.cdt.mylyn*
-%patch20
-
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
 
 # See comments in the script to understand this.
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK \
-  %{eclipse_base} xmlrpc codec httpclient lang rse
+  %{eclipse_base} mylyn xmlrpc codec httpclient lang rse
 ln -s %{_javadir}/lpgjavaruntime-1.1.0.jar SDK/plugins/net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
 SDK=$(cd SDK >/dev/null && pwd)
 
@@ -403,9 +406,11 @@ LAUNCHERJAR=$(ls %{eclipse_base}/plugins \
 LAUNCHER=%{eclipse_base}/plugins/$LAUNCHERJAR
 
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
+mylynInstallDir=${installDir}-mylyn
 parsersInstallDir=${installDir}-parsers
 sdkInstallDir=${installDir}-sdk
 install -d -m755 $installDir
+install -d -m755 $mylynInstallDir
 install -d -m755 $parsersInstallDir
 install -d -m755 $sdkInstallDir
 
@@ -433,6 +438,10 @@ pushd libhover
 unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.zip
 popd
 
+mkdir -p $mylynInstallDir/eclipse/features $mylynInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*mylyn* $mylynInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*mylyn* $mylynInstallDir/eclipse/plugins
+
 # Move upc, xlc, and lrparser plugins/features to parsers install area.
 mkdir -p $parsersInstallDir/eclipse/features $parsersInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*xlc* $parsersInstallDir/eclipse/features
@@ -483,6 +492,27 @@ org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
 rm -rf repo
 popd
 
+# Generate p2 metadata for CDT Mylyn Bridge
+pushd $mylynInstallDir/eclipse
+java -jar $LAUNCHER \
+-application \
+org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
+-metadataRepository file:`pwd`/repo \
+-artifactRepository file:`pwd`/repo \
+-source `pwd` \
+-root "CDT Mylyn Bridge" \
+-rootVersion %{version} \
+-flavor tooling \
+-publishArtifacts \
+-append \
+-artifactRepositoryName "CDT Mylyn" \
+-metadataRepositoryName "CDT Mylyn" \
+-vmargs \
+-Duser.home=$homedir
+
+rm -rf repo
+popd
+
 # Generate p2 metadata for CDT Parsers
 pushd $parsersInstallDir/eclipse
 java -jar $LAUNCHER \
@@ -579,6 +609,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{eclipse_base}/dropins/cdt-sdk
 
+%files mylyn
+%defattr(-,root,root)
+%{eclipse_base}/dropins/cdt-mylyn
+
 %files parsers
 %defattr(-,root,root)
 %{eclipse_base}/dropins/cdt-parsers
@@ -590,6 +624,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Mon Jun 28 2010 Jeff Johnston  <jjohnstn@redhat.com> 1:6.0.2-2
+- Add back mylyn bridge since version of mylyn in F-12 does not have
+  the CDT mylyn bridge in it.
+
 * Fri Jun 18 2010 Jeff Johnston  <jjohnstn@redhat.com> 1:6.0.2-1
 - Rebase CDT to Galileo SR2 (6.0.2).
 - Remove mylyn bridge which is now in mylyn rpm.