diff --git a/tycho-maven-archiver-3.0.1.patch b/tycho-maven-archiver-3.0.1.patch new file mode 100644 index 0000000..cc8972b --- /dev/null +++ b/tycho-maven-archiver-3.0.1.patch @@ -0,0 +1,11 @@ +--- ./tycho-source-plugin/src/main/java/org/eclipse/tycho/source/AbstractSourceJarMojo.java.orig 2016-04-14 17:18:54.033371257 +0100 ++++ ./tycho-source-plugin/src/main/java/org/eclipse/tycho/source/AbstractSourceJarMojo.java 2016-04-14 17:22:02.121228491 +0100 +@@ -259,7 +259,7 @@ + getLog().warn("ignoring unsupported archive forced = false parameter."); + archive.setForced(true); + } +- archiver.createArchive(project, archive); ++ archiver.createArchive(null, project, archive); + } catch (IOException e) { + throw new MojoExecutionException("Error creating source archive: " + e.getMessage(), e); + } catch (ArchiverException e) { diff --git a/tycho.spec b/tycho.spec index ba67a28..d02de95 100644 --- a/tycho.spec +++ b/tycho.spec @@ -27,7 +27,7 @@ Name: %{?scl_prefix}tycho Version: 0.23.0 -Release: 16%{?dist} +Release: 17%{?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 @@ -63,6 +63,7 @@ Patch5: %{pkg_name}-fix-bootstrap-build.patch Patch6: %{pkg_name}-port-to-jetty-9.3.0.patch # Accepted upstream: https://git.eclipse.org/r/49897 Patch7: %{pkg_name}-port-to-plexus-archiver-3.0.1.patch +Patch8: tycho-maven-archiver-3.0.1.patch BuildArch: noarch @@ -177,6 +178,7 @@ tar -xf %{SOURCE6} %patch4 -p1 %patch6 -p0 %patch7 -p0 +%patch8 -p0 find tycho-core -iname '*html' -delete @@ -423,6 +425,10 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li %{_javadocdir}/tycho %changelog +* Thu Apr 14 2016 Mat Booth - 0.23.0-17 +- Fix build against new maven-archiver, which removed some deprecated methods + that tycho was using + * Tue Mar 15 2016 Mat Booth - 0.23.0-16 - Update to latest fp-p2 snapshot