diff --git a/tycho.spec b/tycho.spec
index 45d1a21..1737d98 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -6,11 +6,11 @@
# This basically uses javac + xmvn to build only the Tycho components
# required to perform a full Tycho build
# Most common usage : A library (in Fedora) used by Tycho's runtime broke API
-%global tycho_bootstrap 1
+%global tycho_bootstrap 0
# Set 'eclipse_bootstrap' if Eclipse from buildroot cannot help build Tycho
# This basically provides a location for usage of pre-bundled Eclipse
# Possible uses : Need to build Tycho before Eclipse in fresh buildroot
-%global eclipse_bootstrap 1
+%global eclipse_bootstrap 0
%global git_tag d9ce75d316caae823be78527b7b690182b602895
%global fp_p2_git_tag 290f67a4c717599b2f5166ea89aa5365571314b1
@@ -22,7 +22,7 @@
Name: tycho
Version: 1.2.0
-Release: 0.1.gitd9ce75d%{?dist}
+Release: 0.2.gitd9ce75d%{?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
@@ -123,10 +123,6 @@ Requires: eclipse-platform >= 1:4.7.0
# "eclipse-repository" projects
Requires: maven-clean-plugin
-# Required by tycho-source-plugin, but XMvn fails to generate
-# auto-requires due to uncommon dependency maven-plugin
-Requires: maven-source-plugin
-
%description
Tycho is a set of Maven plugins and extensions for building Eclipse
plugins and OSGI bundles with Maven. Eclipse plugins and OSGI bundles
@@ -285,7 +281,12 @@ sed -i '
# Add fp-p2 to main build
%pom_xpath_inject "pom:modules" "fedoraproject-p2"
+%mvn_package ":org.fedoraproject.p2.tests" __noinstall
+
+# Don't build fp-p2 tests when bootstrapping
+%if %{eclipse_bootstrap}
%pom_disable_module org.fedoraproject.p2.tests fedoraproject-p2
+%endif
%build
%mvn_build -f -- \
@@ -360,6 +361,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}${xmvn_libdir}/inst
%files javadoc -f .mfiles-javadoc
%changelog
+* Wed May 02 2018 Mat Booth - 1.2.0-0.2.gitd9ce75d
+- Non-bootstrap build
+
* Mon Apr 30 2018 Mat Booth - 1.2.0-0.1.gitd9ce75d
- Update to latest tycho snapshot
- Bootstrap build