Use the new FOO_NEVRS extensions for --requires etc popt aliases

- Makes the popt foobar somewhat saner and fixes RhBug:717534 and
  RhBug:735801 while at it.

diff --git a/rpmpopt.in b/rpmpopt.in
index cd66011..36eadbd 100644 (file)
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -51,17 +51,17 @@ rpm alias --setugids -q --qf \
        --POPTdesc=$"set user/group ownership of files in a package"
 
 rpm    alias --conflicts       --qf \
-  "[%|VERBOSE?{%{CONFLICTFLAGS:deptype}: }:{}|%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" \
+  "[%|VERBOSE?{%{CONFLICTFLAGS:deptype}: }:{}|%{CONFLICTNEVRS}\n]" \
        --POPTdesc=$"list capabilities this package conflicts with"
 rpm    alias --obsoletes       --qf \
-  "[%|VERBOSE?{%{OBSOLETEFLAGS:deptype}: }:{}|%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" \
+  "[%|VERBOSE?{%{OBSOLETEFLAGS:deptype}: }:{}|%{OBSOLETENEVRS}\n]" \
        --POPTdesc=$"list other packages removed by installing this package"
 rpm    alias --provides        --qf \
-  "[%|VERBOSE?{%{PROVIDEFLAGS:deptype}: }:{}|%{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}}:{}|\n]" \
+  "[%|VERBOSE?{%{PROVIDEFLAGS:deptype}: }:{}|%{PROVIDENEVRS}\n]" \
        --POPTdesc=$"list capabilities that this package provides"
 
 rpm    alias --requires        --qf \
-  "[%|VERBOSE?{%{REQUIREFLAGS:deptype}: }:{}|%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" \
+  "[%|VERBOSE?{%{REQUIREFLAGS:deptype}: }:{}|%{REQUIRENEVRS}\n]" \
        --POPTdesc=$"list capabilities required by package(s)"
 rpm    alias -R --requires
 
@@ -183,16 +183,16 @@ rpmsign alias --digest-algo --define '_gpg_digest_algo !#:+' \
        --POPTargs=$"<algorithm>"
 
 rpmspec        alias --conflicts       --qf \
-  "[%|VERBOSE?{%{CONFLICTFLAGS:deptype}: }:{}|%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" \
+  "[%|VERBOSE?{%{CONFLICTFLAGS:deptype}: }:{}|%{CONFLICTNEVRS}\n]" \
        --POPTdesc=$"list capabilities this package conflicts with"
 rpmspec        alias --obsoletes       --qf \
-  "[%|VERBOSE?{%{OBSOLETEFLAGS:deptype}: }:{}|%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" \
+  "[%|VERBOSE?{%{OBSOLETEFLAGS:deptype}: }:{}|%{OBSOLETENEVRS}\n]" \
        --POPTdesc=$"list other packages removed by installing this package"
 rpmspec        alias --provides        --qf \
-  "[%|VERBOSE?{%{PROVIDEFLAGS:deptype}: }:{}|%{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}}:{}|\n]" \
+  "[%|VERBOSE?{%{PROVIDEFLAGS:deptype}: }:{}|%{PROVIDENEVRS}\n]" \
        --POPTdesc=$"list capabilities that this package provides"
 rpmspec        alias --requires        --qf \
-  "[%|VERBOSE?{%{REQUIREFLAGS:deptype}: }:{}|%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" \
+  "[%|VERBOSE?{%{REQUIREFLAGS:deptype}: }:{}|%{REQUIRENEVRS}\n]" \
        --POPTdesc=$"list capabilities required by package(s)"
 rpmspec        alias --buildconflicts  --srpm --conflicts \
        --POPTdesc=$"list capabilities conflicting with build of this package"