From 07924e993fb4aabf5105db948e52a8ffdd2a2605 Mon Sep 17 00:00:00 2001
From: Krzysztof Daniel <kdaniel@redhat.com>
Date: Oct 21 2013 12:52:28 +0000
Subject: Fix feature installation.



---

diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 7c6c560..4129119 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -7,7 +7,7 @@
 Summary:          Eclipse Git Integration
 Name:             %{?scl_prefix}eclipse-egit
 Version:          3.1.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          EPL
 URL:              http://www.eclipse.org/egit
 Group:            Development/Tools
@@ -27,7 +27,7 @@ Requires:         %{?scl_prefix}eclipse-jgit >= 1.3.0
 BuildArch:        noarch
 
 %description
-The eclipse-egit package contains Eclipse plugins forcha
+The eclipse-egit package contains Eclipse plugins for
 interacting with Git repositories.
 
 
@@ -63,26 +63,39 @@ mvn-rpmbuild verify -Dmaven.test.skip=true
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
-install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/features
-install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/plugins
-
-unzip -q -d $RPM_BUILD_ROOT%{install_loc}/ org.eclipse.egit.repository/target/org.eclipse.egit.repository-%{version}.*-r.zip
-rm $RPM_BUILD_ROOT%{install_loc}/*.jar
+install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/eclipse
+install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/eclipse/features
+install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/eclipse/plugins
+
+unzip -q -d $RPM_BUILD_ROOT%{install_loc}/eclipse org.eclipse.egit.repository/target/org.eclipse.egit.repository-%{version}.*-r.zip
+pushd $RPM_BUILD_ROOT%{install_loc}/eclipse/features
+  for f in * ; do
+    f_name=${f/.jar//}
+    mkdir -p $f_name
+    unzip -d $f_name $f
+    rm $f 
+  done
+popd
+rm $RPM_BUILD_ROOT%{install_loc}/eclipse/*.jar
 
 %files
 %dir %{install_loc}
-%dir %{install_loc}/plugins
-%dir %{install_loc}/features
-%{install_loc}/features/org.eclipse.egit_*.jar
-%{install_loc}/plugins/
-%exclude %{install_loc}/plugins/org.eclipse.egit.mylyn.ui_*.jar
+%dir %{install_loc}/eclipse
+%dir %{install_loc}/eclipse/plugins
+%dir %{install_loc}/eclipse/features
+%{install_loc}/eclipse/features/org.eclipse.egit_*
+%{install_loc}/eclipse/plugins/
+%exclude %{install_loc}/eclipse/plugins/org.eclipse.egit.mylyn.ui_*.jar
 %doc LICENSE README.md
 
 %files mylyn
-%{install_loc}/features/org.eclipse.egit.mylyn_*.jar
-%{install_loc}/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
+* Mon Oct 21 2013 Krzysztof Daniel <kdaniel@redhat.com> 3.1.0-3
+- Fix feature installation.
+
 * Wed Oct 16 2013 Krzysztof Daniel <kdaniel@redhat.com> 3.1.0-2
 - Package Egit integration for mylyn.
 - Changed building process to reflect upstream one.