diff --git a/xmvn-connector-aether.spec b/xmvn-connector-aether.spec index ab795b4..f16061c 100644 --- a/xmvn-connector-aether.spec +++ b/xmvn-connector-aether.spec @@ -1,5 +1,5 @@ # -# spec file for package xmvn-connector-aether +# spec file # # Copyright (c) 2021 SUSE LLC # diff --git a/xmvn-connector-gradle.spec b/xmvn-connector-gradle.spec index a79008e..dd7053d 100644 --- a/xmvn-connector-gradle.spec +++ b/xmvn-connector-gradle.spec @@ -1,5 +1,5 @@ # -# spec file for package xmvn-connector-gradle +# spec file # # Copyright (c) 2021 SUSE LLC # diff --git a/xmvn-connector-ivy.spec b/xmvn-connector-ivy.spec index ebd128e..d4ee2bd 100644 --- a/xmvn-connector-ivy.spec +++ b/xmvn-connector-ivy.spec @@ -1,5 +1,5 @@ # -# spec file for package xmvn-connector-ivy +# spec file # # Copyright (c) 2021 SUSE LLC # diff --git a/xmvn-mojo.spec b/xmvn-mojo.spec index f5dd464..6b8cc37 100644 --- a/xmvn-mojo.spec +++ b/xmvn-mojo.spec @@ -1,5 +1,5 @@ # -# spec file for package xmvn-mojo +# spec file # # Copyright (c) 2021 SUSE LLC # diff --git a/xmvn-parent.spec b/xmvn-parent.spec index bddecca..87ff466 100644 --- a/xmvn-parent.spec +++ b/xmvn-parent.spec @@ -1,5 +1,5 @@ # -# spec file for package xmvn-parent +# spec file # # Copyright (c) 2021 SUSE LLC # diff --git a/xmvn-tools.spec b/xmvn-tools.spec index 4a5d0ce..75867e2 100644 --- a/xmvn-tools.spec +++ b/xmvn-tools.spec @@ -1,5 +1,5 @@ # -# spec file for package xmvn-tools +# spec file # # Copyright (c) 2021 SUSE LLC # diff --git a/xmvn.changes b/xmvn.changes index e640e10..730a915 100644 --- a/xmvn.changes +++ b/xmvn.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 22 09:15:52 UTC 2021 - Fridrich Strba + +- Specify maven_home manually since the diversity of alternatives + in different distro versions makes it tedious to detect this + automatically + ------------------------------------------------------------------- Thu May 13 10:07:24 UTC 2021 - Fridrich Strba diff --git a/xmvn.spec b/xmvn.spec index 3cbe19a..cba7c4d 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -55,7 +55,10 @@ remote repositories. %build %install -maven_home=$(realpath $(dirname $(realpath $(which mvn)))/..) +# Please, keep in sync with maven package, since the use +# of libalternatives in some distro versions makes it +# more tedious to detect automatically +maven_home=%{_datadir}/maven install -d -m 755 %{buildroot}%{_datadir}/%{name} cp -aL ${maven_home}/* %{buildroot}%{_datadir}/%{name}/