From be3860f37b8eb2c52079fac0deeac94bac2b68eb Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@gmail.com>
Date: Aug 23 2021 10:56:26 +0000
Subject: Don't ship deprecated pack200 plugins and fix a split package resolution issue

  during bootstrap builds

---

diff --git a/tycho.spec b/tycho.spec
index 3237634..3e3b5bb 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -28,7 +28,7 @@
 
 Name:           tycho
 Version:        2.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
@@ -227,6 +227,12 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2
 %pom_remove_dep ":org.eclipse.tycho.surefire.junit57" tycho-surefire/tycho-surefire-plugin
 %endif
 
+# Don't build deprecated pack200 modules
+%pom_disable_module pack200 tycho-extras
+
+# Fix split package issue during bootstrap mode builds
+sed -i -e '/Require-Bundle/s/\(.*\)/\1,org.eclipse.equinox.registry/' tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
+
 # Relax dep on aqute-bndlib
 sed -i -e '/biz.aQute.bndlib/s/5.1.2/3.5.0/' \
   tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
@@ -432,6 +438,10 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{xmvn_libdir}/inst
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Aug 23 2021 Mat Booth <mat.booth@gmail.com> - 2.3.0-3
+- Don't ship deprecated pack200 plugins and fix a split package resolution issue
+  during bootstrap builds
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild