[eclipse-egit/eclipse-luna: 2/4] Rebuilt with mylyn bits enabled

[Mat Booth]

commit 00e9f50d7d383a5844fc40616c90a1bc320485ad
Author: Mat Booth <mat.booth at redhat.com>
Date:   Wed Jul 23 15:09:40 2014 +0100

    Rebuilt with mylyn bits enabled

 eclipse-egit.spec |   25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 6d04503..7b4703f 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.1%{?dist}
+Release:          1.2%{?dist}
 License:          EPL
 URL:              http://www.eclipse.org/egit
 Group:            Development/Tools
@@ -17,8 +17,8 @@ BuildRequires:    java-devel >= 1.6.0
 BuildRequires:    %{?scl_prefix}eclipse-jgit >= 3.4.1
 BuildRequires:    %{?scl_prefix}jgit >= 3.4.1
 BuildRequires:    %{?scl_prefix}tycho
-#BuildRequires:    %{?scl_prefix}eclipse-mylyn-context-team
-#BuildRequires:    %{?scl_prefix}eclipse-mylyn-docs-wikitext
+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,14 +58,6 @@ 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
@@ -99,10 +91,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
+* Wed Jul 23 2014 Mat Booth <mat.booth at redhat.com> - 3.4.1-1.2
+- Rebuilt with mylyn bits enabled
+
 * Fri Jul 18 2014 Mat Booth <mat.booth at redhat.com> - 3.4.1-1.1
 - Build into SCL with mylyn bits temporarily disabled