From ee0a43dd0bc8d20b5659fe014ef13d7e80ffe80b Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sep 08 2014 08:35:49 +0000
Subject: fedoraproject-p2: Import XMvn P2 plugin


---

diff --git a/.gitignore b/.gitignore
index 3fc2da8..8993107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ maven-repo.tar.xz
 /.project
 /eclipse-bootstrap.tar.xz
 /fedoraproject-p2-*.tar.xz
+/fedoraproject-p2-be5015.tar
diff --git a/sources b/sources
index 57762b3..228889b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 127267aa75abd86df6815bcbd7f2492d  tycho-0.21.0.tar.bz2
 8303bf4c107a219ce0c916bb692046f6  eclipse-bootstrap.tar.xz
-104c74837e6296a95989dd8fcbfdf2ee  fedoraproject-p2-962aa8.tar.xz
+1fa665013aa0c05452583c68e92ede11  fedoraproject-p2-be5015.tar
diff --git a/tycho.spec b/tycho.spec
index f2d8ba0..1a8ae80 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -15,7 +15,7 @@
 # %%global snap -SNAPSHOT
 %global snap %{nil}
 
-%global fp_p2_sha 962aa8
+%global fp_p2_sha be5015
 %global fp_p2_version 0.0.1
 %global fp_p2_snap -SNAPSHOT
 
@@ -23,7 +23,7 @@
 
 Name:           tycho
 Version:        0.21.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -79,6 +79,7 @@ BuildRequires:  decentxml
 BuildRequires:  easymock
 BuildRequires:  ecj
 BuildRequires:  maven-plugin-testing-harness
+BuildRequires:  xmvn-parent-pom
 %if ! %{tycho_bootstrap}
 BuildRequires:  %{name}
 %endif
@@ -288,14 +289,14 @@ mod=fedoraproject-p2
 install -pm 644 $mod/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$mod.pom
 %add_maven_depmap JPP.%{name}-$mod.pom
 
-# org.fedoraproject.p2
-mod=fedoraproject-p2/org.fedoraproject.p2
-aid=`basename $mod`
-pushd $mod
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
-install -m 644 target/$aid-%{fp_p2_version}%{fp_p2_snap}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$aid.jar
-popd
-%add_maven_depmap JPP.%{name}-$aid.pom %{name}/$aid.jar
+# fedoraproject-p2
+for mod in fedoraproject-p2/{org.fedoraproject.p2,xmvn-p2-installer-plugin}; do
+   echo $mod
+   aid=`basename $mod`
+   install -pm 644 $mod/pom.xml  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
+   install -m 644 $mod/target/$aid-%{fp_p2_version}%{fp_p2_snap}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$aid.jar
+   %add_maven_depmap JPP.%{name}-$aid.pom %{name}/$aid.jar -a "org.eclipse.tycho:$aid"
+done
 
 # pom and jar installation
 for mod in target-platform-configuration tycho-compiler-{jdt,plugin} \
@@ -378,14 +379,24 @@ install -m 644 $osgiStateJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.compati
 %add_maven_depmap JPP.%{name}-osgi.compatibility.state.pom %{name}/osgi.compatibility.state.jar -a "org.eclipse.tycho:org.eclipse.osgi.compatibility.state"
 %endif
 
+# Symlink XMvn P2 plugin with all dependencies so that it can be loaded by XMvn
+install -d -m 755 %{buildroot}%{_datadir}/xmvn/lib/installer/
+ln -s %{_javadir}/eclipse/osgi.jar %{buildroot}%{_datadir}/xmvn/lib/installer/
+ln -s %{_javadir}/%{name}/xmvn-p2-installer-plugin.jar %{buildroot}%{_datadir}/xmvn/lib/installer/
+ln -s %{_javadir}/%{name}/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/lib/installer/
+
 %files -f .mfiles
 %dir %{_javadir}/%{name}
+%{_datadir}/xmvn/lib/installer/*
 %doc README.md
 
 %files javadoc
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Sep  8 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.21.0-8
+- fedoraproject-p2: Import XMvn P2 plugin
+
 * Fri Sep 05 2014 Roland Grunberg <rgrunber@redhat.com> - 0.21.0-7
 - Debundle tycho-bundles-external and tycho-standalone-p2-director.
 - Resolves: rhbz#789272