From 615bc4efe18bf704bccf27f877a0e8065afee99a Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Apr 08 2021 12:54:56 +0000 Subject: Update to upstream 2.3.0 release There is no longer standalone-p2-director artifact. --- diff --git a/sources b/sources index 2e1ff11..14f7c9c 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (fedoraproject-p2-0be3abaa1729553b13f384a008b1cd1fb00beaf4.tar.gz) = 0fc3585203eff6dcaf08c679a258dc8f108a6d64a29f88983a8ac10ae82641b85ea5cf05e112daadaeef95d798255d1307efd8b2d55b5d482b36b448709f7ab5 -SHA512 (eclipse-bootstrap-2020-12.tar.xz) = 28d93663bb7e4d86341fc40c648416039f57cee7bb3922ea1cb939f69d70e8fd857120ead181e3877455af5abfb3d400dacb7efcffd3344e1276c0ad11782513 -SHA512 (org.eclipse.tycho-tycho-2.2.0.tar.xz) = 4c37b4d3bbd55bf4a433f44cf0f98f63c147d97f094a0c43e8379c5006df8eb033b2000abfa148ad279129d70bb6499dca9f0e753c2f60697e7042187483e457 +SHA512 (org.eclipse.tycho-tycho-2.3.0.tar.xz) = 3c486da942561fe4e4d5abb761d280cfe896a619a3c7aadec3ec5971b7eb229c32c2afdc91a2a5907c2493092e79ffbfb0e7f4ac99f06606840dd7afc7d35e32 diff --git a/tycho.spec b/tycho.spec index 541c3d3..6ec7e22 100644 --- a/tycho.spec +++ b/tycho.spec @@ -27,8 +27,8 @@ %define __requires_exclude osgi* Name: tycho -Version: 2.2.0 -Release: 4%{?dist} +Version: 2.3.0 +Release: 1%{?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 @@ -335,18 +335,6 @@ sed -i ' %mvn_config resolverSettings/metadataRepositories/repository $PWD/boot/tycho-metadata.xml %endif -# Avoid duplicate execution of clean when generating javadocs, see ebz#399756 -%pom_add_plugin :maven-clean-plugin tycho-bundles/tycho-standalone-p2-director " - - - default-clean-1 - initialize - - true - - -" - # Add fp-p2 to main build %pom_xpath_inject "pom:modules" "fedoraproject-p2" @@ -372,9 +360,6 @@ cp %{SOURCE3} %{SOURCE5} . # Debundle p2 runtime ./tycho-debundle.sh $(pwd)/tycho-bundles/tycho-bundles-external \ $(pwd)/tycho-bundles/tycho-bundles-external/target/tycho-bundles-external-manifest.txt - -# Debundle standalone p2 director -./tycho-debundle.sh $(pwd)/tycho-bundles/tycho-standalone-p2-director %endif %if %{with bootstrap} @@ -447,6 +432,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{xmvn_libdir}/inst %files javadoc -f .mfiles-javadoc %changelog +* Thu Apr 8 2021 Alexander Kurtakov 2.3.0-1 +- Update to upstream 2.3.0 release. + * Mon Feb 8 2021 Mat Booth - 2.2.0-4 - Fix eln build