From d6eadb5fd04bdc0356e8edf12db88a20d53e52e1 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 15 Sep 2017 12:24:44 +0300 Subject: [PATCH] Fix FTBFS after maven-remote-reources-plugin update --- maven.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/maven.spec b/maven.spec index b27e255..7052838 100644 --- a/maven.spec +++ b/maven.spec @@ -5,7 +5,7 @@ Name: maven Epoch: 1 Version: 3.5.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java project management and project comprehension tool License: ASL 2.0 URL: http://maven.apache.org/ @@ -161,6 +161,10 @@ find -name '*.bat' -delete sed -i 's:\r::' apache-maven/src/conf/settings.xml +# Downloads dependency licenses from the Internet and aggregates them. +# We already ship the licenses in their respective packages. +rm apache-maven/src/main/appended-resources/META-INF/LICENSE.vm + # Disable plugins which are not useful for us %pom_remove_plugin -r :animal-sniffer-maven-plugin %pom_remove_plugin -r :apache-rat-plugin @@ -248,6 +252,9 @@ ln -sf %{_sysconfdir}/%{name}/logging %{buildroot}%{_datadir}/%{name}/conf %changelog +* Fri Sep 15 2017 Michael Simacek - 1:3.5.0-7 +- Fix FTBFS after maven-remote-reources-plugin update + * Tue Aug 08 2017 Michael Simacek - 1:3.5.0-6 - Generate build number based on package release number