From 14ae31c080894a642d4959cc146ee821bfc3b503 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mar 11 2019 21:18:26 +0000
Subject: Bootstrap with new felix-scr


---

diff --git a/sources b/sources
index 9438463..62e6620 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (fedoraproject-p2-290f67a4c717599b2f5166ea89aa5365571314b1.tar.gz) = 5ddfa3e7c1dc3d64335d836d74d7325904f294e0ab1782de41a8815b09ddf42f0c47a263c3a6217626aaf293a17788d01174c327e17b192a0f451d07d5655c49
 SHA512 (org.eclipse.tycho-tycho-1.3.0.tar.xz) = 8f4f9ed89b87f5a486285e64c6a6e8906c7a01a82666d8483ba0a136ec6fc49fcb85a7748ed425bf8d7cfad722b25472dd02b770122575268e2addba5b80e7f2
-SHA512 (eclipse-bootstrap-photon.tar.xz) = c18687eecd7d79bbd0722e8effc89d32a8fe31f2c9fe978cc73cfe9679d5a7fd01d8e12483404e3257d86817b7a12b4dcdfbd88316855a06d8f43da71a3c49a8
+SHA512 (eclipse-bootstrap-photon.tar.xz) = f696947d2deedcc85739a91ca0d5b3312756d8575226aab6e8021ea1983630f951fff1f9ae5de953d14ac57a285cca3183469960466977301cda4cc3fe722e49
diff --git a/tycho.spec b/tycho.spec
index e22d6b1..d27aa62 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -9,7 +9,7 @@
 # Tycho such that it can build a bootstrap mode Eclipse and subsequently
 # fully rebuild itself. In this mode, there may be reduced functionality,
 # so a full non-bootstrap mode build should always be done afterwards.
-%bcond_with bootstrap
+%bcond_without bootstrap
 
 # Allow conditionally building without Junit 5 support
 %bcond_without junit5
@@ -25,7 +25,7 @@
 
 Name:           tycho
 Version:        1.3.0
-Release:        2%{?dist}
+Release:        3%{?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
@@ -122,8 +122,8 @@ BuildRequires:  eclipse-platform >= 1:4.8.0
 # For bootstrapping, we just need the dependencies of the Eclipse bundles we use
 BuildRequires:  osgi(com.ibm.icu)
 BuildRequires:  osgi(org.apache.commons.jxpath)
-BuildRequires:  osgi(org.apache.felix.scr)
 BuildRequires:  osgi(org.apache.batik.css)
+BuildRequires:  osgi(org.kxml2)
 BuildRequires:  osgi(org.sat4j.core)
 BuildRequires:  osgi(org.sat4j.pb)
 BuildRequires:  osgi(org.w3c.css.sac)
@@ -406,6 +406,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}${xmvn_libdir}/inst
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Mar 11 2019 Mat Booth <mat.booth@redhat.com> - 1.3.0-3
+- Bootstrap with new felix-scr
+
 * Tue Feb 19 2019 Mat Booth <mat.booth@redhat.com> - 1.3.0-2
 - Allow building against ASM 6