diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2011-09-06 16:12:15 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2011-09-06 16:12:15 +0300 |
| commit | d0198dac5a5a75963ddbefcd0819de0ad968bd3f (patch) | |
| tree | 420555422e6851782626ed11c04030346be873a1 /rpmpopt.in | |
| parent | 628ad2fae22cd29786c1f36f97e68142fe8f5ec7 (diff) | |
| download | rpm-d0198dac5a5a75963ddbefcd0819de0ad968bd3f.tar.gz | |
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.
Diffstat (limited to 'rpmpopt.in')
| -rw-r--r-- | rpmpopt.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rpmpopt.in b/rpmpopt.in index cd66011a8..36eadbdf3 100644 --- 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" |