diff --git a/.gitignore b/.gitignore index f72258c..4829832 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /*.src.rpm /org.eclipse.license-57a2c5aac0e8cb3a0bfbb4468826e5c2a45d5029.tar.bz2 +/org.eclipse.license-e80ffa9b3652eb2534d92a9b8729bc70ed0b4d06.tar.xz +/org.eclipse.license-license-1.0.1.v20140414-1359.tar.xz diff --git a/eclipse-license.spec b/eclipse-license.spec index a81cfad..f3501ee 100644 --- a/eclipse-license.spec +++ b/eclipse-license.spec @@ -1,18 +1,18 @@ # We need to ship both versions of the EPL # Some plug-ins are moving to EPL 2, but some plug-ins might stay with EPL 1 -%global eplv2_ver 2.0.1 -%global eplv2_tag org.eclipse.license-license-%{eplv2_ver}.v20180423-1114 +%global eplv2_ver 2.0.2 +%global eplv2_tag org.eclipse.license-e80ffa9b3652eb2534d92a9b8729bc70ed0b4d06 %global eplv1_ver 1.0.1 %global eplv1_tag org.eclipse.license-license-%{eplv1_ver}.v20140414-1359 Name: eclipse-license Version: %{eplv2_ver} -Release: 10%{?dist} +Release: 1%{?dist} Summary: Shared license features for Eclipse License: EPL-1.0 and EPL-2.0 -URL: http://wiki.eclipse.org/CBI -Source1: http://git.eclipse.org/c/cbi/org.eclipse.license.git/snapshot/%{eplv1_tag}.tar.bz2 -Source2: http://git.eclipse.org/c/cbi/org.eclipse.license.git/snapshot/%{eplv2_tag}.tar.bz2 +URL: https://wiki.eclipse.org/CBI +Source1: https://git.eclipse.org/c/cbi/org.eclipse.license.git/snapshot/%{eplv1_tag}.tar.xz +Source2: https://git.eclipse.org/c/cbi/org.eclipse.license.git/snapshot/%{eplv2_tag}.tar.xz BuildArch: noarch @@ -29,9 +29,6 @@ features to avoid unnecessary duplication of license boiler plate. Version: %{eplv1_ver} Summary: Shared EPL v1.0 license feature for Eclipse License: EPL-1.0 -# Provides/Obsoletes added in F28 -Provides: eclipse-license = %{eplv1_ver}-20 -Obsoletes: eclipse-license < %{eplv2_ver}-%{release} %description -n %{name}1 Shared license feature for Eclipse. Other features may consume this @@ -60,7 +57,7 @@ pushd %{eplv1_tag} popd pushd %{eplv2_tag} -sed -i -e 's/\(-SNAPSHOT\|\.qualifier\)/.v20180423-1114/' pom.xml */*.xml +sed -i -e 's/\(-SNAPSHOT\|\.qualifier\)/.v20181016-2210/' pom.xml */*.xml %mvn_build -j popd @@ -88,6 +85,9 @@ popd %license %{eplv2_tag}/org.eclipse.license/*.html %changelog +* Fri Oct 30 13:47:34 GMT 2020 Mat Booth - 2.0.2-1 +- Update to latest upstream release + * Mon Jul 27 2020 Fedora Release Engineering - 2.0.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 38a823a..766fa53 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (org.eclipse.license-license-1.0.1.v20140414-1359.tar.bz2) = 5b749fa58cc1c0371b0da2aedcf25710f13a29b5d947043dbbe3bdbd937d97e60742c4318db43d81977a49d732b341d11cabf66a4b606ef799c4db49dceb47ce -SHA512 (org.eclipse.license-license-2.0.1.v20180423-1114.tar.bz2) = a39f54da3e158c18cbb0455f9333b7f0144d5d467e03f45d418ca92fade96ffc466d1a1917a620598d4f8fdfac972dea8755a196acb7c5e41db728a672af640b +SHA512 (org.eclipse.license-e80ffa9b3652eb2534d92a9b8729bc70ed0b4d06.tar.xz) = 777823c8923fde365641bbae39498e9fa56f29a4cf8e9f1e4ef61018a72bfb31e27d2c54736399f0385e015f6db8f5bac64027cceda50cb57184215554fe600d +SHA512 (org.eclipse.license-license-1.0.1.v20140414-1359.tar.xz) = ca6aed167025841f2af56efbcdfffa69556aa1a2391e4d028c927aa2a3c7784dcc807252a62352b0da0b6f641f6c8fd4fe94472b0b4332dd9a1efba099a78266