From ae6947765d345cf165c6a2748e12b29c12f537e0 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jun 30 2015 11:52:12 +0000
Subject: Fix bootstrap build


- fedoraproject-p2: Allow xmvn-p2-installer to work in bootstrap mode

---

diff --git a/sources b/sources
index a195733..feea374 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-cc9859883beb0c3dd67f98a1f80c4864  fedoraproject-p2-a61745.tar.xz
+b872538815981866cefb289e32d1d54b  fedoraproject-p2-439721.tar.xz
 0a14e091316e0a467f94c7821b9e21e6  org.eclipse.tycho-tycho-0.23.0.tar.xz
 6c81cc0da4efbb555b28abb2847791b4  eclipse-bootstrap.tar.xz
diff --git a/tycho-bootstrap.sh b/tycho-bootstrap.sh
index fefa271..cf5c3ff 100755
--- a/tycho-bootstrap.sh
+++ b/tycho-bootstrap.sh
@@ -135,5 +135,4 @@ cp 'tycho-bundles/tycho-bundles-external/pom.xml' "${loc}/tycho-bundles-external
 
 sed -i "s/<equinox\(.*\)VersionMaven>.*<\/equinox\(.*\)VersionMaven>/<equinox\1VersionMaven>${osgiV}<\/equinox\1VersionMaven>/" pom.xml
 # xmvn-p2-installer-plugin needs to find the org.eclipse.osgi bundle
-sed -i "s/<groupId>org.eclipse.osgi<\/groupId>/<groupId>org.eclipse.tycho<\/groupId>/
-        /<artifactId>org.eclipse.osgi<\/artifactId>/ a <version>${osgiV}<\/version>" fedoraproject-p2/xmvn-p2-installer-plugin/pom.xml
+sed -i "s/>\${equinox-version}</>${osgiV}</" fedoraproject-p2/xmvn-p2-installer-plugin/pom.xml
diff --git a/tycho.spec b/tycho.spec
index 8f04ec7..a6a52ef 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -19,7 +19,7 @@
 
 %global git_tag tycho-0.23.0
 
-%global fp_p2_sha a61745
+%global fp_p2_sha 439721
 %global fp_p2_version 0.0.1
 %global fp_p2_snap -SNAPSHOT
 
@@ -27,7 +27,7 @@
 
 Name:           %{?scl_prefix}tycho
 Version:        0.23.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 # license file is missing but all files having some licensing information are ASL 2.0
@@ -414,7 +414,6 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
 %{?scl:EOF}
 
 %files -f .mfiles
-%dir %{_javadir}/tycho
 %{_datadir}/xmvn/lib/installer/*
 %{_javadir}-utils/p2-install.sh
 %doc README.md
@@ -423,6 +422,10 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
 %{_javadocdir}/tycho
 
 %changelog
+* Tue Jun 30 2015 Mat Booth <mat.booth@redhat.com> - 0.23.0-6
+- Fix bootstrap build
+- fedoraproject-p2: Allow xmvn-p2-installer to work in bootstrap mode
+
 * Thu Jun 25 2015 Roland Grunberg <rgrunber@redhat.com> - 0.23.0-5
 - fedoraproject-p2: Do not generate requires for fragments.
 - Update to work with maven-surefire 2.18.