Duplicate query aliases onto rpmq.

CVS patchset: 3782
CVS date: 2000/05/31 17:39:01

diff --git a/installplatform b/installplatform
index 2c55597..f6a3816 100755 (executable)
--- a/installplatform
+++ b/installplatform
@@ -23,11 +23,11 @@ target="`$RPM --eval '%{_target}'`"
 
 case "$arch" in
   i[3456]86) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_' ;;
-  sparc*) SUBSTS='s_sparc64_sparc_ s_sparc\([^6]\)_sparc64\1_' ;;
+  sparc*) SUBSTS='s_sparc64_sparc_ s_sparc\([^6]\|$\)_sparc64\1_' ;;
   *) SUBSTS=y___ ;;
 esac
 
-for SUBST in $SUBSTS 's_^[^-]*-_noarch-_' ; do
+for SUBST in $SUBSTS ; do
   ARCH=`echo $arch | sed -e $SUBST`
   TARGET_PLATFORM=`echo $target_platform | sed -e $SUBST`
   TARGET=`echo $target | sed -e $SUBST`
@@ -60,4 +60,6 @@ for SUBST in $SUBSTS 's_^[^-]*-_noarch-_' ; do
 
 done
 
+ln -sf ${ARCH}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS}
+
 rm $TEMPRC

diff --git a/po/rpm.pot b/po/rpm.pot
index 18b51db..4fedac6 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 07:50-0400\n"
+"POT-Creation-Date: 2000-05-31 13:32-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index 9196a95..0ddcd5b 100644 (file)
--- a/popt/po/popt.pot
+++ b/popt/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-26 14:35-0400\n"
+"POT-Creation-Date: 2000-05-31 13:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/rpm.spec b/rpm.spec
index 4097074..f31eaa6 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -5,7 +5,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 4.0
 Version: %{version}
-Release: 0.26
+Release: 0.27
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL

diff --git a/rpmpopt.in b/rpmpopt.in
index ba43157..f36ed4b 100644 (file)
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -3,7 +3,7 @@
 # belong in /etc/popt, not here. This file will be replaced
 # whenever a new version of RPM is installed.
 
-rpm alias --scripts --qf '\
+rpm    alias --scripts --qf '\
 %|PREIN?{preinstall script\
 %|PREINPROG?{ (through %{PREINPROG})}|:\n%{PREIN}\n}:\
 {%|PREINPROG?{preinstall program: %{PREINPROG}\n}|}|\
@@ -23,29 +23,29 @@ rpm alias --scripts --qf '\
 %|VERIFYSCRIPT?{verify script:\n%{VERIFYSCRIPT}\n}|\
 '
 
-rpm alias --setperms -q --qf '[\[ -L %{FILENAMES:shescape} \] || chmod %7.7{FILEMODES:octal} %{FILENAMES:shescape}\n]' \
+rpm    alias --setperms -q --qf '[\[ -L %{FILENAMES:shescape} \] || chmod %7.7{FILEMODES:octal} %{FILENAMES:shescape}\n]' \
                   --pipe "grep -v \(none\) | sed 's/chmod .../chmod /' | sh"
 
-rpm alias --setugids -q --qf \
+rpm    alias --setugids -q --qf \
         '[ch %{FILEUSERNAME:shescape} %{FILEGROUPNAME:shescape} %{FILENAMES:shescape}\n]' \
         --pipe "(echo 'ch() { chown -- \"$1\" \"$3\";chgrp -- \"$2\" \"$3\"; }';grep -v \(none\))|sh"
 
 
-rpm alias --conflicts  --qf \
+rpm    alias --conflicts       --qf \
   "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]"
-rpm alias --obsoletes  --qf \
+rpm    alias --obsoletes       --qf \
   "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]"
-rpm alias --provides   --qf \
+rpm    alias --provides        --qf \
   "[%{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}}:{}|\n]"
 
 # XXX prereq output is part of requires for query
 #rpm alias --prereq    --qf '[%{PREREQ}:depflags\n]'
 
-rpm alias --requires   --qf \
+rpm    alias --requires        --qf \
   "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]"
-rpm alias -R --requires
+rpm    alias -R --requires
 
-rpm alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocateable)}|\n\
+rpm    alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocateable)}|\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\
@@ -56,19 +56,19 @@ Size        : %-27{SIZE}%|LICENSE?{      License: %{LICENSE}}|\n\
 Summary     : %{SUMMARY}\n\
 Description :\n%{DESCRIPTION}\n'
 
-rpm alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n\n%{CHANGELOGTEXT}\n\n]'
+rpm    alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n\n%{CHANGELOGTEXT}\n\n]'
 
-rpm alias --triggerscripts --qf '\
+rpm    alias --triggerscripts --qf '\
 [trigger%{TRIGGERTYPE} script (through %{TRIGGERSCRIPTPROG}) -- %{TRIGGERCONDS}\n\
 %{TRIGGERSCRIPTS}\n]'
-rpm alias --triggers --triggerscripts
+rpm    alias --triggers --triggerscripts
 
-rpm alias --last --qf ''%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %{NAME}-%{VERSION}-%{RELEASE} %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n' \
+rpm    alias --last --qf ''%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %{NAME}-%{VERSION}-%{RELEASE} %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n' \
        --pipe "sort -r -n | sed 's,^[0-9]\+ ,,' | awk '{printf(\"%-35s %-s\n\", $1, substr($0,length($1)+2))}' "
 
-rpm alias --filesbypkg --qf '[%-25{=NAME} %{FILENAMES}\n]'
-rpm exec --freshen freshen.sh
-rpm alias -F --freshen
+rpm    alias --filesbypkg --qf '[%-25{=NAME} %{FILENAMES}\n]'
+rpm    exec --freshen freshen.sh
+rpm    alias -F --freshen
 
 rpm alias --redhatprovides -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatprovides
 rpm alias --redhatrequires -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatrequires
@@ -187,6 +187,70 @@ rpmq       alias --ftpport         --define '_ftpport !#:+'
 rpmq   alias --ftpproxy        --define '_ftpproxy !#:+'
 rpmq   alias --httpport        --define '_httpport !#:+'
 rpmq   alias --httpproxy       --define '_httpproxy !#:+'
+
+rpmq   alias --scripts --qf '\
+%|PREIN?{preinstall script\
+%|PREINPROG?{ (through %{PREINPROG})}|:\n%{PREIN}\n}:\
+{%|PREINPROG?{preinstall program: %{PREINPROG}\n}|}|\
+\
+%|POSTIN?{postinstall script\
+%|POSTINPROG?{ (through %{POSTINPROG})}|:\n%{POSTIN}\n}:\
+{%|POSTINPROG?{postinstall program: %{POSTINPROG}\n}|}|\
+\
+%|PREUN?{preuninstall script\
+%|PREUNPROG?{ (through %{PREUNPROG})}|:\n%{PREUN}\n}:\
+{%|PREUNPROG?{preuninstall program: %{PREUNPROG}\n}|}|\
+\
+%|POSTUN?{postuninstall script\
+%|POSTUNPROG?{ (through %{POSTUNPROG})}|:\n%{POSTUN}\n}:\
+{%|POSTUNPROG?{postuninstall program: %{POSTUNPROG}\n}|}|\
+\
+%|VERIFYSCRIPT?{verify script:\n%{VERIFYSCRIPT}\n}|\
+'
+
+rpmq   alias --setperms -q --qf '[\[ -L %{FILENAMES:shescape} \] || chmod %7.7{FILEMODES:octal} %{FILENAMES:shescape}\n]' \
+                  --pipe "grep -v \(none\) | sed 's/chmod .../chmod /' | sh"
+
+rpmq   alias --setugids -q --qf \
+        '[ch %{FILEUSERNAME:shescape} %{FILEGROUPNAME:shescape} %{FILENAMES:shescape}\n]' \
+        --pipe "(echo 'ch() { chown -- \"$1\" \"$3\";chgrp -- \"$2\" \"$3\"; }';grep -v \(none\))|sh"
+
+rpmq   alias --conflicts       --qf \
+  "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]"
+rpmq   alias --obsoletes       --qf \
+  "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]"
+rpmq   alias --provides        --qf \
+  "[%{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}}:{}|\n]"
+
+# XXX prereq output is part of requires for query
+#rpmq  alias --prereq  --qf '[%{PREREQ}:depflags\n]'
+
+rpmq   alias --requires        --qf \
+  "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]"
+rpmq   alias -R --requires
+
+rpmq   alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocateable)}|\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{SIZE}%|LICENSE?{      License: %{LICENSE}}|\n\
+%|PACKAGER?{Packager    : %{PACKAGER}\n}|\
+%|URL?{URL         : %{URL}\n}|\
+Summary     : %{SUMMARY}\n\
+Description :\n%{DESCRIPTION}\n'
+
+rpmq   alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n\n%{CHANGELOGTEXT}\n\n]'
+
+rpmq   alias --triggerscripts --qf '\
+[trigger%{TRIGGERTYPE} script (through %{TRIGGERSCRIPTPROG}) -- %{TRIGGERCONDS}\n\
+%{TRIGGERSCRIPTS}\n]'
+rpmq   alias --triggers --triggerscripts
+
+rpmq   alias --last --qf ''%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %{NAME}-%{VERSION}-%{RELEASE} %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n' \
+       --pipe "sort -r -n | sed 's,^[0-9]\+ ,,' | awk '{printf(\"%-35s %-s\n\", $1, substr($0,length($1)+2))}' "
+
+rpmq   alias --filesbypkg --qf '[%-25{=NAME} %{FILENAMES}\n]'
 #==============================================================================
 rpmt   alias --dbpath          --define '_dbpath !#:+'
 rpmt   alias --ftpport         --define '_ftpport !#:+'