This commit is contained in:
parent
15dcdb6a8d
commit
6faf0619eb
@ -36,7 +36,6 @@ Source4: https://downloads.apache.org/maven/KEYS#/%{name}.keyring
|
|||||||
Source10: apache-%{name}-%{version}-build.tar.xz
|
Source10: apache-%{name}-%{version}-build.tar.xz
|
||||||
Patch1: 0001-Adapt-mvn-script.patch
|
Patch1: 0001-Adapt-mvn-script.patch
|
||||||
# Downstream-specific, avoids dependency on logback
|
# Downstream-specific, avoids dependency on logback
|
||||||
# Used only when %%without logback is in effect
|
|
||||||
Patch2: 0002-Invoke-logback-via-reflection.patch
|
Patch2: 0002-Invoke-logback-via-reflection.patch
|
||||||
Patch3: qdox-2.0.1.patch
|
Patch3: qdox-2.0.1.patch
|
||||||
Patch4: 0004-Use-non-shaded-HTTP-wagon.patch
|
Patch4: 0004-Use-non-shaded-HTTP-wagon.patch
|
||||||
@ -185,6 +184,7 @@ BuildArch: noarch
|
|||||||
%setup -q -n apache-%{name}-%{version} -a10
|
%setup -q -n apache-%{name}-%{version} -a10
|
||||||
|
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
@ -218,10 +218,7 @@ sed -i "s/distributionName=.*/distributionName=Apache\ Maven/" `find -name build
|
|||||||
|
|
||||||
%{mvn_package} :apache-maven __noinstall
|
%{mvn_package} :apache-maven __noinstall
|
||||||
|
|
||||||
%if %{without logback}
|
|
||||||
%pom_remove_dep -r :logback-classic
|
%pom_remove_dep -r :logback-classic
|
||||||
%patch2 -p1
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%{mvn_alias} :maven-resolver-provider :maven-aether-provider
|
%{mvn_alias} :maven-resolver-provider :maven-aether-provider
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user