rpm/rpmpopt.diff

---
 rpmpopt.in |   47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

Index: rpmpopt.in
===================================================================
--- rpmpopt.in.orig
+++ rpmpopt.in
@@ -94,7 +94,8 @@ Signature   : %|DSAHEADER?{%{DSAHEADER:p
 %|PACKAGER?{Packager    : %{PACKAGER}\n}|\
 %|URL?{URL         : %{URL}\n}|\
 Summary     : %{SUMMARY}\n\
-Description :\n%{DESCRIPTION}\n' \
+Description :\n%{DESCRIPTION}\n\
+Distribution: %{DISTRIBUTION}\n' \
 	--POPTdesc=$"list descriptive information from package(s)"
 
 rpm	alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]' \
@@ -140,12 +141,6 @@ rpm	alias --fileprovide --qf '[%{FILENAM
 rpm	alias --filerequire --qf '[%{FILENAMES}\t%{FILEREQUIRE}\n]' \
 	--POPTdesc=$"list file names with requires"
 
-rpm alias --redhatprovides -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatprovides \
-	--POPTdesc=$"find package name that contains a provided capability (needs rpmdb-redhat package installed)"
-
-rpm alias --redhatrequires -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatrequires \
-	--POPTdesc=$"find package name that contains a required capability (needs rpmdb-redhat package installed)"
-
 # colon separated i18n domains to use as PO catalogue lookaside for
 * retrieving header group/description/summary.
 #
@@ -212,22 +207,22 @@ rpm	alias --timecheck	--define '_timeche
 #rpm	exec --target		rpmb --target
 #rpm	exec --short-circuit	rpmb --short-circuit
 
-rpm	exec --initdb		rpmd --initdb
-rpm	exec --rebuilddb	rpmd --rebuilddb
-rpm	exec --verifydb		rpmd --verifydb
-
-rpm	exec --addsign		rpmk --addsign
-rpm	exec -K			rpmk -K
-rpm	exec --checksig		rpmk --checksig
-rpm	exec --import		rpmk --import
-rpm	exec --resign		rpmk --resign
-
-rpm	exec -q			rpmq -q
-rpm	exec --query		rpmq --query
-rpm	exec --querytags	rpmq --querytags
-rpm	exec -V			rpmv -V
-rpm	exec -y			rpmv -y
-rpm	exec --verify		rpmv --verify
+#rpm	exec --initdb		rpmd --initdb
+#rpm	exec --rebuilddb	rpmd --rebuilddb
+#rpm	exec --verifydb		rpmd --verifydb
+
+#rpm	exec --addsign		rpmk --addsign
+#rpm	exec -K			rpmk -K
+#rpm	exec --checksig		rpmk --checksig
+#rpm	exec --import		rpmk --import
+#rpm	exec --resign		rpmk --resign
+
+#rpm	exec -q			rpmq -q
+#rpm	exec --query		rpmq --query
+#rpm	exec --querytags	rpmq --querytags
+#rpm	exec -V			rpmv -V
+#rpm	exec -y			rpmv -y
+#rpm	exec --verify		rpmv --verify
 
 #rpm	exec -i			rpmi -i
 #rpm	exec --install		rpmi --install
@@ -393,7 +388,8 @@ Signature   : %|DSAHEADER?{%{DSAHEADER:p
 %|PACKAGER?{Packager    : %{PACKAGER}\n}|\
 %|URL?{URL         : %{URL}\n}|\
 Summary     : %{SUMMARY}\n\
-Description :\n%{DESCRIPTION}\n' \
+Description :\n%{DESCRIPTION}\n\
+Distribution: %{DISTRIBUTION}\n' \
 	--POPTdesc=$"list descriptive information from package(s)"
 
 rpmq	alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]' \
@@ -509,7 +505,8 @@ Size        : %-27{SIZE}%|LICENSE?{
 %|PACKAGER?{Packager    : %{PACKAGER}\n}|\
 %|URL?{URL         : %{URL}\n}|\
 Summary     : %{SUMMARY}\n\
-Description :\n%{DESCRIPTION}\n' \
+Description :\n%{DESCRIPTION}\n\
+Distribution: %{DISTRIBUTION}\n' \
 	--POPTdesc=$"list descriptive information from package(s)"
 
 rpmquery	alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]' \