diff --git a/macros.in b/macros.in index b4c2adc86a..c907de937b 100644 --- a/macros.in +++ b/macros.in @@ -552,7 +552,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ #%__find_provides %{_rpmconfigdir}/rpmdeps --provides #%__find_requires %{_rpmconfigdir}/rpmdeps --requires %__find_provides %{_rpmconfigdir}/find-provides -%__find_requires %{_rpmconfigdir}/find-requires +%__find_requires %{_rpmconfigdir}/enhance-requires #%__find_conflicts ??? #%__find_obsoletes ??? diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 6cfee631a7..cac552b665 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -4,7 +4,7 @@ install(PROGRAMS brp-strip-static-archive brp-elfperms brp-remove-la-files check-files check-prereqs check-buildroot check-rpaths check-rpaths-worker - find-lang.sh find-requires find-provides + find-lang.sh enhance-requires find-requires find-provides perl.prov perl.req pkgconfigdeps.sh ocamldeps.sh diff --git a/scripts/enhance-requires b/scripts/enhance-requires new file mode 100644 index 0000000000..59fb7b3fca --- /dev/null +++ b/scripts/enhance-requires @@ -0,0 +1,15 @@ +#!/bin/sh + +version_deps () { + while read dep + do + if [[ "${dep}" =~ ^[^\(]*\(\) ]] && rpm -q --whatprovides "${dep}" &> /dev/null + then + printf "($dep with %s)\n" "$(rpm -q --whatprovides "${dep}" --qf '%{NAME} >= %{VERSION}')" + else + printf "%s\n" "${dep}" + fi + done +} + +/usr/lib/rpm/find-requires | version_deps