From 4a349907979751cecf1778d2e94c0eafdbc0bf45 Mon Sep 17 00:00:00 2001
From: lyn1001 <thistleslyn@163.com>
Date: Sun, 13 Sep 2020 19:33:24 +0800
Subject: [PATCH] fix build fail

---
 tycho-extras-use-custom-resolver.patch | 52 ++++++++++++++++++++++++++
 tycho-extras.spec                      |  7 +++-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 tycho-extras-use-custom-resolver.patch

diff --git a/tycho-extras-use-custom-resolver.patch b/tycho-extras-use-custom-resolver.patch
new file mode 100644
index 0000000..6637225
--- /dev/null
+++ b/tycho-extras-use-custom-resolver.patch
@@ -0,0 +1,52 @@
+From 1136a52447b28da1dfa29c46b8ba025435a798be Mon Sep 17 00:00:00 2001
+From: Roland Grunberg <rgrunber@redhat.com>
+Date: Mon, 6 May 2013 14:20:58 -0400
+Subject: [PATCH] Use custom resolver for tycho-eclipserun-plugin.
+
+Add various system local OSGi bundle locations to the target platform
+used by tycho-eclipserun-plugin.
+
+Change-Id: Ifd0aae3f32c8077cd0ae33e70f40698c1129788d
+---
+ tycho-eclipserun-plugin/pom.xml                                |  5 +++++
+ .../org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java    | 10 ++++++++++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java b/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
+index 4c4baf0..18db847 100644
+--- a/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
++++ b/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
+@@ -13,6 +13,7 @@ package org.eclipse.tycho.extras.eclipserun;
+ 
+ import java.io.File;
+ import java.net.MalformedURLException;
++import java.net.URI;
+ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.Map;
+@@ -52,6 +53,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2Resolver;
+ import org.eclipse.tycho.p2.resolver.facade.P2ResolverFactory;
+ import org.eclipse.tycho.p2.target.facade.TargetPlatformConfigurationStub;
+ import org.eclipse.tycho.plugins.p2.extras.Repository;
++import org.fedoraproject.p2.EclipseSystemLayout;
+ 
+ /**
+  * Launch an eclipse process with arbitrary commandline arguments. The eclipse installation is
+@@ -225,6 +227,14 @@ public class EclipseRunMojo extends AbstractMojo {
+         TargetPlatformConfigurationStub tpConfiguration = new TargetPlatformConfigurationStub();
+         // we want to resolve from remote repos only
+         tpConfiguration.setForceIgnoreLocalArtifacts(true);
++
++        // Add Fedora Local P2 Repository when running in local mode
++        if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
++            for (URI uri : EclipseSystemLayout.getRepositories()) {
++                tpConfiguration.addP2Repository(new MavenRepositoryLocation(uri.getPath(), uri));
++            }
++        }
++
+         for (Repository repository : repositories) {
+             tpConfiguration.addP2Repository(new MavenRepositoryLocation(repository.getId(), repository.getLocation()));
+         }
+-- 
+1.9.3
+
diff --git a/tycho-extras.spec b/tycho-extras.spec
index 3f97aaf..4864062 100644
--- a/tycho-extras.spec
+++ b/tycho-extras.spec
@@ -1,13 +1,14 @@
 %global xmvn_libdir %(realpath $(dirname $(readlink -f $(which xmvn)))/../lib)
 Name:                tycho-extras
 Version:             1.3.0
-Release:             1
+Release:             2
 Summary:             Additional plugins for Tycho
 License:             EPL-1.0
 URL:                 http://eclipse.org/tycho/
 Source0:             http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/org.eclipse.tycho.extras-tycho-extras-%{version}.tar.xz
 Patch0:              %{name}-fix-build.patch
 Patch1:              fix-xmvn-pomless-builddep.patch
+Patch2:              tycho-extras-use-custom-resolver.patch
 BuildArch:           noarch
 ExcludeArch:         s390 %{arm} %{ix86}
 BuildRequires:       maven-local mvn(io.takari.polyglot:polyglot-common)
@@ -39,6 +40,7 @@ This package contains the API documentation for %{name}.
 %setup -q -n org.eclipse.tycho.extras-tycho-extras-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %pom_remove_plugin :maven-site-plugin
 %pom_remove_plugin org.eclipse.m2e:lifecycle-mapping
 %pom_remove_plugin org.sonatype.plugins:maven-properties-plugin tycho-p2-extras-plugin
@@ -60,5 +62,8 @@ ln -s %{_javadir}/tesla-polyglot/polyglot-common.jar %{buildroot}%{xmvn_libdir}/
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Sun Sep 13 2020 yanan li <liyanan032@huawei.com> - 1.3.0-2
+- fix build fail
+
 * Wed Aug 19 2020 maminjie <maminjie1@huawei.com> - 1.3.0-1
 - package init