Add Epoch, Architecture and BugURL to rpm -qi and fix alignment (RhBug:575499)

diff --git a/rpmpopt.in b/rpmpopt.in
index 1d8816a..40ee12a 100644 (file)
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -65,15 +65,25 @@ rpm alias --requires        --qf \
        --POPTdesc=$"list capabilities required by package(s)"
 rpm    alias -R --requires
 
-rpm    alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\
-Version     : %-27{VERSION}       Vendor: %{VENDOR}\n\
-Release     : %-27{RELEASE}   Build Date: %{BUILDTIME:date}\n\
-Install Date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed)         }|      Build Host: %{BUILDHOST}\n\
-Group       : %-27{GROUP}   Source RPM: %{SOURCERPM}\n\
-Size        : %-27{LONGSIZE}%|LICENSE?{      License: %{LICENSE}}|\n\
+rpm    alias --info --qf '\
+Name        : %{NAME}\n\
+%|EPOCH?{Epoch       : %{EPOCH}\n}|\
+Version     : %{VERSION}\n\
+Release     : %{RELEASE}\n\
+Architecture: %{ARCH}\n\
+Install Date: %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n\
+Group       : %{GROUP}\n\
+Size        : %{LONGSIZE}\n\
+%|LICENSE?{License     : %{LICENSE}}|\n\
 Signature   : %|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|\n\
+Source RPM  : %{SOURCERPM}\n\
+Build Date  : %{BUILDTIME:date}\n\
+Build Host  : %{BUILDHOST}\n\
+Relocations : %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\
 %|PACKAGER?{Packager    : %{PACKAGER}\n}|\
+%|VENDOR?{Vendor      : %{VENDOR}\n}|\
 %|URL?{URL         : %{URL}\n}|\
+%|BUGURL?{Bug URL     : %{BUGURL}\n}|\
 Summary     : %{SUMMARY}\n\
 Description :\n%{DESCRIPTION}\n' \
        --POPTdesc=$"list descriptive information from package(s)"