From 4604adfdd9bfcef62a953cfcfc6f0a6a084410a8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 8 Jul 2020 08:29:59 +0200 Subject: [PATCH] Try not to require packages by name --- javapackages-tools.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index fa3ca7b..9b58297 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -78,9 +78,8 @@ install their content. Summary: Macros and scripts for Maven packaging support Requires: %{name} = %{version}-%{release} Requires: javapackages-local = %{version}-%{release} -Requires: xmvn-minimal -Requires: xmvn-mojo -Requires: xmvn-connector-aether +Requires: %{_bindir}/xmvn +Requires: mvn(org.fedoraproject.xmvn:xmvn-mojo) # Common Maven plugins required by almost every build. It wouldn't make # sense to explicitly require them in every package built with Maven. Requires: mvn(org.apache.maven.plugins:maven-compiler-plugin) @@ -106,9 +105,9 @@ artifact resolution using XMvn resolver. %package -n javapackages-local Summary: Non-essential macros and scripts for Java packaging support Requires: %{name} = %{version}-%{release} -Requires: xmvn-install -Requires: xmvn-subst -Requires: xmvn-resolve +Requires: %{_bindir}/xmvn-install +Requires: %{_bindir}/xmvn-subst +Requires: %{_bindir}/xmvn-resolve # Java build systems don't have hard requirement on java-devel, so it should be there Requires: java-11-openjdk-devel Requires: %{python_interpreter}