[eclipse-gef/f18] Properly unpack features.

[Krzysztof Daniel]

commit 2374052965933aa3008747e4ab17dd63e04a7c32
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Thu Oct 4 13:12:46 2012 +0200

    Properly unpack features.

 eclipse-gef.spec |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)
---
diff --git a/eclipse-gef.spec b/eclipse-gef.spec
index ca250d9..f996c56 100644
--- a/eclipse-gef.spec
+++ b/eclipse-gef.spec
@@ -3,7 +3,7 @@
 Name:      eclipse-gef
 Version:   3.8.1
 #no tag in the repository, HEAD checked out
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Graphical Editing Framework (GEF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -81,6 +81,15 @@ fi
 
 mvn-rpmbuild clean install -f org.eclipse.gef.releng/pom.xml -Dmaven.local.mode=true
 
+pushd org.eclipse.gef.repository/target/repository/features/
+for f in `ls`; do \
+    name=${f/.jar//};  \
+    mkdir $name;  \
+    unzip -q -n -d $name $f ; \
+    rm -rf $f
+done
+popd
+
 %install
 
 install -d -m 755 %{buildroot}%{eclipse_dropin}
@@ -91,21 +100,20 @@ install -d -m 755 %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins
 install -d -m 755 %{buildroot}%{eclipse_dropin}/gef-examples/eclipse/features
 install -d -m 755 %{buildroot}%{eclipse_dropin}/gef-examples/eclipse/plugins
 
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef/eclipse/features org.eclipse.gef.repository/target/repository/features/org.eclipse.gef_*.jar
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef/eclipse/features org.eclipse.gef.repository/target/repository/features/org.eclipse.draw2d_*.jar
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef/eclipse/features org.eclipse.gef.repository/target/repository/features/org.eclipse.zest_*.jar
+mv org.eclipse.gef.repository/target/repository/features/org.eclipse.gef_* %{buildroot}%{eclipse_dropin}/gef/eclipse/features/
+mv org.eclipse.gef.repository/target/repository/features/org.eclipse.draw2d_* %{buildroot}%{eclipse_dropin}/gef/eclipse/features/
 
 mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.gef_*.jar %{buildroot}%{eclipse_dropin}/gef/eclipse/plugins/ 
 mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.draw2d_*.jar %{buildroot}%{eclipse_dropin}/gef/eclipse/plugins/
 mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.zest.core_*.jar %{buildroot}%{eclipse_dropin}/gef/eclipse/plugins/
 mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.zest.layouts_*.jar %{buildroot}%{eclipse_dropin}/gef/eclipse/plugins/
 
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features org.eclipse.gef.repository/target/repository/features/org.eclipse.gef.sdk_*.jar
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features org.eclipse.gef.repository/target/repository/features/org.eclipse.gef.source_*.jar
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features org.eclipse.gef.repository/target/repository/features/org.eclipse.zest.sdk_*.jar
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features org.eclipse.gef.repository/target/repository/features/org.eclipse.zest.source_*.jar
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features org.eclipse.gef.repository/target/repository/features/org.eclipse.draw2d.sdk_*.jar
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features org.eclipse.gef.repository/target/repository/features/org.eclipse.draw2d.source_*.jar
+mv org.eclipse.gef.repository/target/repository/features/org.eclipse.gef.sdk_* %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features/
+mv org.eclipse.gef.repository/target/repository/features/org.eclipse.gef.source_* %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features/
+mv org.eclipse.gef.repository/target/repository/features/org.eclipse.zest.sdk_* %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features/
+mv org.eclipse.gef.repository/target/repository/features/org.eclipse.zest.source_* %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features/
+mv org.eclipse.gef.repository/target/repository/features/org.eclipse.draw2d.sdk_* %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features/
+mv org.eclipse.gef.repository/target/repository/features/org.eclipse.draw2d.source_* %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features/
 
 mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.draw2d.doc.isv_*.jar %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins/
 mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.draw2d.source_*.jar %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins/
@@ -115,8 +123,8 @@ mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.gef.source_*
 mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.zest.core.source_*.jar %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins/
 mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.zest.layouts.source_*.jar %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins/
 
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-examples/eclipse/features org.eclipse.gef.repository/target/repository/features/org.eclipse.gef.examples_*.jar
-unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-examples/eclipse/features org.eclipse.gef.repository/target/repository/features/org.eclipse.gef.examples.source_*.jar
+mv org.eclipse.gef.repository/target/repository/features/org.eclipse.gef.examples_* %{buildroot}%{eclipse_dropin}/gef-examples/eclipse/features/
+mv org.eclipse.gef.repository/target/repository/features/org.eclipse.gef.examples.source_* %{buildroot}%{eclipse_dropin}/gef-examples/eclipse/features/
 
 mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.gef.examples.{flow,flow.source,logic,logic.source,shapes,shapes.source,text,text.source}_*.jar %{buildroot}%{eclipse_dropin}/gef-examples/eclipse/plugins/
 
@@ -139,6 +147,9 @@ mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.gef.examples
 %doc org.eclipse.gef.examples-feature/epl-v10.html
 
 %changelog
+* Thu Oct 4 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.8.1-3
+- Properly unpack features.
+
 * Wed Oct 3 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.8.1-2
 - Fix installation location