From 3da0e0334578f1f28addb2832dfb2eb6ec41768e Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Jun 03 2014 10:26:53 +0000
Subject: Use feclipse-maven-plugin to have features unzipped.


- Simplify spec a bit.
---

diff --git a/eclipse-rse.spec b/eclipse-rse.spec
index c258290..b2c39d8 100644
--- a/eclipse-rse.spec
+++ b/eclipse-rse.spec
@@ -1,7 +1,4 @@
-%if 0%{?rhel} >= 6
-%global debug_package %{nil}
-%endif
-%global install_loc         %{_datadir}/eclipse/dropins
+%global install_loc         %{_datadir}/eclipse/dropins/rse
 %global rseserver_install   %{_datadir}/eclipse-rse-server
 %global rseserver_java      %{_datadir}/java/eclipse-rse-server
 %global rseserver_config    %{_sysconfdir}/sysconfig/rseserver
@@ -11,7 +8,7 @@ Name: eclipse-rse
 Summary: Eclipse Remote System Explorer
 Version: 3.5.1
 #it looks like RC4 was released with kepler without rename.
-Release: 0.2.RC4%{?dist}
+Release: 0.3.RC4%{?dist}
 License: EPL
 URL: http://www.eclipse.org/dsdp/tm/
 
@@ -47,14 +44,11 @@ BuildRequires:    java-devel >= 1.5.0
 %endif
 %endif
 
-%if 0%{?rhel} >= 6
-ExclusiveArch: i686 x86_64
-%else
 BuildArch: noarch
-%endif
 
 BuildRequires: tycho
 BuildRequires: tycho-extras
+BuildRequires: feclipse-maven-plugin
 BuildRequires: maven >= 3.0.3
 BuildRequires: junit
 
@@ -98,8 +92,7 @@ popd
 sed -i -e 's|3.2,3.3|3.2,3.9|g' pom.xml
 
 %build
-export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
-mvn-rpmbuild -DskipTychoVersionCheck -Dmaven.test.skip=true clean install
+xmvn -o -DskipTychoVersionCheck -Dmaven.test.skip=true clean install
 
 cp %{SOURCE4} .
 cp %{SOURCE5} .
@@ -107,23 +100,19 @@ cp %{SOURCE5} .
 %install
 
 install -d -m 755 %{buildroot}%{_datadir}/eclipse
-install -d -m 755 %{buildroot}%{install_loc}/rse/eclipse
+install -d -m 755 %{buildroot}%{install_loc}/eclipse
 install -d -m 755 %{buildroot}%{rseserver_install}
 install -d -m 755 %{buildroot}%{rseserver_java}
 install -d -m 755 %{buildroot}%{rseserver_config}
 
-cp -R releng/org.eclipse.tm.repo/target/repository/features \
-   %{buildroot}%{install_loc}/rse/eclipse \
+xmvn -o org.fedoraproject:feclipse-maven-plugin:install -DsourceRepo=releng/org.eclipse.tm.repo/target/repository -DtargetLocation=%{buildroot}%{install_loc}/eclipse
 
-cp -R releng/org.eclipse.tm.repo/target/repository/plugins \
-   %{buildroot}%{install_loc}/rse/eclipse \
-
-pushd %{buildroot}%{install_loc}/rse/eclipse/plugins
+pushd %{buildroot}%{install_loc}/eclipse/plugins
 rm org.apache.commons.net_*.jar
 ln -s %{_javadir}/commons-net.jar org.apache.commons.net.jar
 popd
 
-pushd %{buildroot}%{install_loc}/rse/eclipse/plugins
+pushd %{buildroot}%{install_loc}/eclipse/plugins
 unzip -q -o -d %{buildroot}%{rseserver_java} org.eclipse.rse.services.dstore_*.jar dstore_miners.jar
 unzip -q -o -d %{buildroot}%{rseserver_java} org.eclipse.dstore.core_*.jar dstore_core.jar
 unzip -q -o -d %{buildroot}%{rseserver_java} org.eclipse.dstore.extra_*.jar dstore_extra_server.jar
@@ -149,7 +138,7 @@ cp *.dat %{buildroot}%{rseserver_install}
 popd
 
 %files
-%{install_loc}/rse
+%{install_loc}
 %doc rse/features/org.eclipse.rse.sdk-feature/epl-v10.html
 %doc rse/features/org.eclipse.rse.sdk-feature/license.html
 
@@ -163,6 +152,10 @@ popd
 %doc epl-v10.html
 
 %changelog
+* Tue Jun 3 2014 Alexander Kurtakov <akurtako@redhat.com> 3.5.1-0.3.RC4
+- Use feclipse-maven-plugin to have features unzipped.
+- Simplify spec a bit.
+
 * Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 3.5.1-0.2.RC4
 - Use Requires: java-headless rebuild (#1067528)