[eclipse-egit/eclipse-luna: 1/4] Build into SCL with mylyn bits temporarily disabled

[Mat Booth]

commit 0d7737243afebddc670ad10865770dbe524387c5
Author: Mat Booth <mat.booth at redhat.com>
Date:   Fri Jul 18 10:25:38 2014 +0100

    Build into SCL with mylyn bits temporarily disabled

 eclipse-egit.spec |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index efb28f0..6d04503 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -7,7 +7,7 @@
 Summary:          Eclipse Git Integration
 Name:             %{?scl_prefix}eclipse-egit
 Version:          3.4.1
-Release:          1%{?dist}
+Release:          1.1%{?dist}
 License:          EPL
 URL:              http://www.eclipse.org/egit
 Group:            Development/Tools
@@ -16,9 +16,9 @@ Source0:          http://git.eclipse.org/c/egit/egit.git/snapshot/egit-%{version
 BuildRequires:    java-devel >= 1.6.0
 BuildRequires:    %{?scl_prefix}eclipse-jgit >= 3.4.1
 BuildRequires:    %{?scl_prefix}jgit >= 3.4.1
-BuildRequires:    tycho
-BuildRequires:    %{?scl_prefix}eclipse-mylyn-context-team
-BuildRequires:    %{?scl_prefix}eclipse-mylyn-docs-wikitext
+BuildRequires:    %{?scl_prefix}tycho
+#BuildRequires:    %{?scl_prefix}eclipse-mylyn-context-team
+#BuildRequires:    %{?scl_prefix}eclipse-mylyn-docs-wikitext
 Requires:         %{?scl_prefix}eclipse-platform >= 1:3.5.0
 Requires:         %{?scl_prefix}eclipse-jgit >= 3.4.1
 %{?scl:Requires: %scl_runtime}
@@ -32,9 +32,9 @@ interacting with Git repositories.
 
 %package mylyn
 Summary:     Git integration for mylyn.
-Requires:    %{?scl_prefix}eclipse-mylyn-context-team
+#Requires:    %{?scl_prefix}eclipse-mylyn-context-team
 Requires:    %{?scl_prefix}eclipse-egit = %{version}-%{release}
-Requires:    %{?scl_prefix}eclipse-mylyn-docs-wikitext
+#Requires:    %{?scl_prefix}eclipse-mylyn-docs-wikitext
 Group: Development/Tools
 
 %description mylyn
@@ -58,8 +58,18 @@ sed -i -e "15,29d" org.eclipse.egit.repository/category.xml
 sed -i -e "9,11d" org.eclipse.egit.repository/category.xml
 sed -i -e "12,14d" org.eclipse.egit.repository/category.xml
 
+# Don't build mylyn bits yet
+%pom_disable_module org.eclipse.egit.mylyn.ui
+%pom_disable_module org.eclipse.egit.mylyn-feature
+%pom_disable_module org.eclipse.egit.doc
+sed -i -e '65,70d' org.eclipse.egit-feature/feature.xml
+sed -i -e '40,45d' org.eclipse.egit.source-feature/feature.xml
+sed -i -e '9,11d' org.eclipse.egit.repository/category.xml
+
 %build
+%{?scl:scl enable %{scl} - << "EOF"}
 xmvn -o clean verify -Dmaven.test.skip=true
+%{?scl:EOF}
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
@@ -89,10 +99,13 @@ rm $RPM_BUILD_ROOT%{install_loc}/eclipse/*.jar
 %doc LICENSE README.md
 
 %files mylyn
-%{install_loc}/eclipse/features/org.eclipse.egit.mylyn_*
-%{install_loc}/eclipse/plugins/org.eclipse.egit.mylyn.ui_*.jar
+#%{install_loc}/eclipse/features/org.eclipse.egit.mylyn_*
+#%{install_loc}/eclipse/plugins/org.eclipse.egit.mylyn.ui_*.jar
 
 %changelog
+* Fri Jul 18 2014 Mat Booth <mat.booth at redhat.com> - 3.4.1-1.1
+- Build into SCL with mylyn bits temporarily disabled
+
 * Thu Jun 26 2014 Mat Booth <mat.booth at redhat.com> - 3.4.1-1
 - Update to latest upstream release 3.4.1