From 6d90bd7dbf7d753bda7dfae50a086225edac9f42 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Feb 02 2021 21:35:26 +0000
Subject: Debootstrap build


---

diff --git a/tycho.spec b/tycho.spec
index 809bede..afebfce 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_without bootstrap
+%bcond_with bootstrap
 
 # Allow conditionally building without Junit 5 support
 %bcond_with junit5
@@ -28,7 +28,7 @@
 
 Name:           tycho
 Version:        2.1.0
-Release:        4%{?dist}
+Release:        5%{?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
@@ -301,7 +301,7 @@ cp %{SOURCE3} %{SOURCE4} .
 
 sysVer=`grep -C 1 "<artifactId>tycho</artifactId>" %{_mavenpomdir}/tycho/tycho.pom | grep "version" | sed 's/.*>\(.*\)<.*/\1/'`
 mkdir boot
-sed -e 's/ns[0-9]://g' %{_datadir}/maven-metadata/tycho.xml > boot/tycho-metadata.xml
+sed -e 's/ns[0-9]://g' %{_datadir}/maven-metadata/%{name}.xml > boot/tycho-metadata.xml
 
 # Copy Tycho POMs from system repo and set their versions to %%{version}-SNAPSHOT.
 for pom in $(grep 'pom</path>' boot/tycho-metadata.xml | sed 's|.*>\(.*\)<.*|\1|'); do
@@ -347,7 +347,7 @@ sed -i '
 %build
 %mvn_build -f -- \
   -Dtycho-version=%{version}-SNAPSHOT -DtychoBootstrapVersion=%{version}-SNAPSHOT \
-  -Dmaven.repo.local=$(pwd)/.m2 -Dfedora.p2.repos=$(pwd)/bootstrap -Dasm-version=8.0.1
+  -Dmaven.repo.local=$(pwd)/.m2 -Dfedora.p2.repos=$(pwd)/bootstrap -Dasm-version=8.0.1 -Dequinox-version=3.16.0.v20200914-0420
 
 %mvn_artifact fedoraproject-p2/org.fedoraproject.p2/pom.xml
 
@@ -413,7 +413,7 @@ done
 
 # For some reason fp-p2 is treated as a compat version, this prevents that
 # TODO: figure out why
-sed -i '/<resolvedVersion>/d' %{buildroot}%{_datadir}/maven-metadata/tycho.xml
+sed -i '/<resolvedVersion>/d' %{buildroot}%{_datadir}/maven-metadata/%{name}.xml
 
 # p2-install script
 install -dm 755 %{buildroot}%{_javadir}-utils/
@@ -441,6 +441,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{xmvn_libdir}/inst
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Feb  2 2021 Mat Booth <mat.booth@redhat.com> - 2.1.0-5
+- Debootstrap build
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild