[eclipse-fedorapackager/f21] Fix broken symlink and unexploded features.

[Mat Booth]

commit a8ddb63a330a02683c67d03a4bcf244e6c085c92
Author: Mat Booth <mat.booth at redhat.com>
Date:   Thu Nov 6 15:07:54 2014 +0000

    Fix broken symlink and unexploded features.

 .gitignore                  |   19 +++++--------------
 eclipse-fedorapackager.spec |   26 +++++++++++++++++---------
 2 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 99e138c..b57eb64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,6 @@
-eclipse-fedorapackager
-eclipse-fedorapackager.tar.xz
-remove_me.tar
-/eclipse-fedorapackager-0.2.0-0.1.20110815git.fc16.src.rpm
 /noarch
-eclipse-fedorapackager-0.2.0.tar.xz
-eclipse-fedorapackager-0.2.1.tar.xz
-eclipse-fedorapackager-0.2.2.tar.xz
-eclipse-fedorapackager-0.2.3.tar.xz
-eclipse-fedorapackager-0.3.0.tar.xz
-eclipse-fedorapackager-0.3.1.tar.xz
-eclipse-fedorapackager-0.3.2.tar.xz
-eclipse-fedorapackager-0.4.0.tar.xz
-/eclipse-fedorapackager-0.4.1.tar.xz
-/eclipse-fedorapackager-0.5.0.tar.xz
+/eclipse-fedorapackager-*.tar.xz
+/eclipse-fedorapackager-*/
+/.project
+/.build-*.log
+/*.src.rpm
diff --git a/eclipse-fedorapackager.spec b/eclipse-fedorapackager.spec
index 8784f30..abbe2de 100644
--- a/eclipse-fedorapackager.spec
+++ b/eclipse-fedorapackager.spec
@@ -2,18 +2,15 @@
 
 Name:           eclipse-fedorapackager
 Version:        0.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fedora Packager for Eclipse
 
-Group:          Development/Tools
 License:        EPL
 URL:            https://fedorahosted.org/eclipse-fedorapackager
-Source0:        https://git.fedorahosted.org/cgit/{name}.git/snapshot/%{name}-%{version}.tar.xz
+Source0:        https://git.fedorahosted.org/cgit/eclipse-fedorapackager.git/snapshot/%{name}-%{version}.tar.xz
 
 BuildArch: noarch
 
-BuildRequires: java-devel
-BuildRequires: eclipse-pde >= 1:3.7.0
 BuildRequires: not-yet-commons-ssl >= 0.3.11-8
 BuildRequires: google-gson
 BuildRequires: eclipse-changelog
@@ -29,7 +26,6 @@ BuildRequires: maven-local
 BuildRequires: tycho
 BuildRequires: tycho-extras
 BuildRequires: easymock
-BuildRequires: maven-clean-plugin
 Requires: eclipse-platform >= 3.7.0
 Requires: google-gson
 Requires: not-yet-commons-ssl >= 0.3.11-8
@@ -54,7 +50,7 @@ such as Koji, Bodhi and Git.
 %setup -q
 
 %build
-xmvn -o clean install -Dmaven.test.skip=true
+xmvn -o clean verify -Dmaven.test.skip=true
 
 %install
 install -d -m 755 %{buildroot}%{install_loc}
@@ -62,20 +58,29 @@ mkdir -p %{buildroot}%{install_loc}/eclipse
 mv org.fedoraproject.eclipse.packager-p2-repo/target/repository/features %{buildroot}%{install_loc}/eclipse/features
 mv org.fedoraproject.eclipse.packager-p2-repo/target/repository/plugins %{buildroot}%{install_loc}/eclipse/plugins
 
+# Explode features
+pushd %{buildroot}%{install_loc}/eclipse/features
+for f in $(ls *.jar) ; do
+  feature=$(echo $f | sed -e "s|\(org.*\)_.*|\1|g")
+  mkdir $feature
+  unzip -q -o -d $feature $f
+  rm $f
+done
+popd
+
 # Remove old and create new symlinks to Import-Packages 
 # in %%{_datadir}/eclipse/dropins/packager
 pushd %{buildroot}%{install_loc}/eclipse/plugins
 # Link to system libs
 %{__ln_s} %{_javadir}/xmlrpc-client.jar
 %{__ln_s} %{_javadir}/xmlrpc-common.jar
-%{__ln_s} %{_javadir}/google-gson.jar
+%{__ln_s} %{_javadir}/google-gson/gson.jar
 for i in %{_javadir}/httpcomponents/*{core,client,mime}*.jar; do
   %{__ln_s} $i
 done
 %{__ln_s} %{_javadir}/ws-commons-util.jar
 %{__ln_s} %{_javadir}/not-yet-commons-ssl.jar
 %{__ln_s} %{_javadir}/commons-codec.jar
-%{__ln_s} %{_javadir}/jakarta-commons-httpclient.jar
 popd
 
 %files
@@ -83,6 +88,9 @@ popd
 %doc org.fedoraproject.eclipse.packager-feature/*.html
 
 %changelog
+* Thu Nov 06 2014 Mat Booth <mat.booth at redhat.com> - 0.5.0-2
+- Fix broken symlink and unexploded features.
+
 * Wed Sep 3 2014 Alexander Kurtakov <akurtako at redhat.com> 0.5.0-1
 - Update to upstream 0.5.0 release.