Sync with rpm-4_0 branch.

CVS patchset: 4361
CVS date: 2000/12/19 23:22:00

diff --git a/CHANGES b/CHANGES
index c2cc78e..92d66b9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -72,6 +72,7 @@
        - add rpmlib(HeaderLoadSortsTags) for tracking header regions
                "just in case".
        - create _tmppath on the fly if not present.
+       - remove /etc/rpm/macros.db1 configuration file if db3 rebuilt.
 
 3.0.6 -> 4.0
        - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db.

diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index dfd7207..8573e87 100644 (file)
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -241,6 +241,9 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
     dbiIndex dbi = NULL;
     int _dbapi, _dbapi_rebuild, _dbapi_wanted;
     int rc = 0;
+#ifdef DYING
+    static int _printed = 0;
+#endif
 
     dbix = dbiTagToDbix(rpmtag);
     if (dbix < 0 || dbix >= dbiTagsMax)
@@ -259,7 +262,7 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
     default:
        _dbapi = _dbapi_wanted;
        if (_dbapi < 0 || _dbapi >= 4 || mydbvecs[_dbapi] == NULL) {
-           static int _printed = 0;
+#ifdef DYING
            if (!_printed++)
                fprintf(stderr, _("\n\
 --> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n\
@@ -267,6 +270,7 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
     and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n\
 \n\
 "),        _dbapi_wanted);
+#endif
            return NULL;
        }
        errno = 0;
@@ -308,8 +312,8 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
 
     /* Require conversion. */
     if (rc && _dbapi_wanted >= 0 && _dbapi != _dbapi_wanted && _dbapi_wanted == _dbapi_rebuild) {
-       static int _printed = 0;
        rc = (_rebuildinprogress ? 0 : 1);
+#ifdef DYING
        if (rc && !_printed++)
            fprintf(stderr, _("\n\
 --> The rpm database cannot be opened in db%d format.\n\
@@ -317,12 +321,13 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
     your database to db%d format by running \"rpm --rebuilddb\" as root.\n\
 \n\
 "),    _dbapi_wanted, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3));
+#endif
        goto exit;
     }
 
     /* Suggest possible configuration */
     if (_dbapi_wanted >= 0 && _dbapi != _dbapi_wanted) {
-       static int _printed = 0;
+#ifdef DYING
        if (!_printed++)
            fprintf(stderr, _("\n\
 --> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n\
@@ -330,14 +335,15 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
     and configure \"%%_dbapi %d\" (e.g. create and/or edit /etc/rpm/macros).\n\
 \n\
 "),    _dbapi_wanted, _dbapi, _dbapi);
+#endif
        rc = 1;
        goto exit;
     }
 
     /* Suggest possible configuration */
     if (_dbapi_wanted < 0 && _dbapi != _dbapi_rebuild) {
-       static int _printed = 0;
        rc = (_rebuildinprogress ? 0 : 1);
+#ifdef DYING
        if (rc && !_printed++)
            fprintf(stderr, _("\n\
 --> The rpm database is in db%d format, not the suggested db%d format.\n\
@@ -348,6 +354,7 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
 \n\
 "),    _dbapi, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3),
        _dbapi, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3), _dbapi);
+#endif
        goto exit;
     }
 
@@ -2324,6 +2331,16 @@ static int rpmdbMoveDatabase(const char * rootdir,
        return rc;
 
     rc = rpmdbRemoveDatabase(rootdir, newdbpath, _newdbapi);
+
+
+    /* Remove /etc/rpm/macros.db1 configuration file if db3 rebuilt. */
+    if (rc == 0 && _newdbapi == 1 && _olddbapi == 3) {
+       const char * mdb1 = "/etc/rpm/macros.db1";
+       struct stat st;
+       if (!stat(mdb1, &st) && S_ISREG(st.st_mode) && !unlink(mdb1))
+           rpmMessage(RPMMESS_DEBUG,
+               _("removing %s after successful db3 rebuild.\n"), mdb1);
+    }
     return rc;
 }
 

diff --git a/po/rpm.pot b/po/rpm.pot
index a13d66c..c283ca8 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-12-19 09:06-0500\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\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"
@@ -81,11 +81,11 @@ msgid "RPM version %s\n"
 msgstr ""
 
 #: rpm.c:200 rpmqv.c:284
-msgid "Copyright (C) 1998 - Red Hat Software"
+msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
 #: rpm.c:201 rpmqv.c:285
-msgid "This may be freely redistributed under the terms of the GNU GPL"
+msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
 #: rpm.c:209
@@ -3185,7 +3185,7 @@ msgstr ""
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:264
+#: lib/rpmdb.c:267
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3194,17 +3194,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:283
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)"
 msgstr ""
 
-#: lib/rpmdb.c:299
+#: lib/rpmdb.c:303
 #, c-format
 msgid "cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:318
 #, c-format
 msgid ""
 "\n"
@@ -3214,7 +3214,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:327
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3224,7 +3224,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:342
+#: lib/rpmdb.c:348
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3235,136 +3235,141 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:410
+#: lib/rpmdb.c:417
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:528
+#: lib/rpmdb.c:535
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:537
+#: lib/rpmdb.c:544
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2351
+#: lib/rpmdb.c:779 lib/rpmdb.c:2368
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:871
+#: lib/rpmdb.c:878
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1083
+#: lib/rpmdb.c:1090
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
+#: lib/rpmdb.c:1149 lib/rpmdb.c:1693
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1746
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1750
+#: lib/rpmdb.c:1757
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1759
+#: lib/rpmdb.c:1766
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1901
+#: lib/rpmdb.c:1908
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1964
+#: lib/rpmdb.c:1971
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1980
+#: lib/rpmdb.c:1987
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1989
+#: lib/rpmdb.c:1996
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2376
+#: lib/rpmdb.c:2342
+#, c-format
+msgid "removing %s after successful db3 rebuild.\n"
+msgstr ""
+
+#: lib/rpmdb.c:2393
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2380
+#: lib/rpmdb.c:2397
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2386
+#: lib/rpmdb.c:2403
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2388
+#: lib/rpmdb.c:2405
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2395
+#: lib/rpmdb.c:2412
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2406
+#: lib/rpmdb.c:2423
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2429
+#: lib/rpmdb.c:2446
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2466
+#: lib/rpmdb.c:2483
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2501
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2492
+#: lib/rpmdb.c:2509
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2511
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2504
+#: lib/rpmdb.c:2521
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2506
+#: lib/rpmdb.c:2523
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/popt/acconfig.h b/popt/acconfig.h
index 7fe3ea9..10965f1 100644 (file)
--- a/popt/acconfig.h
+++ b/popt/acconfig.h
@@ -1,6 +1,6 @@
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 /* acconfig.h
    This file is in the public domain.

diff --git a/popt/findme.c b/popt/findme.c
index b5878a1..e65762d 100644 (file)
--- a/popt/findme.c
+++ b/popt/findme.c
@@ -2,9 +2,9 @@
  * \file popt/findme.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 #include "findme.h"

diff --git a/popt/findme.h b/popt/findme.h
index 78f714e..44ec801 100644 (file)
--- a/popt/findme.h
+++ b/popt/findme.h
@@ -2,9 +2,9 @@
  * \file popt/findme.h
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #ifndef H_FINDME
 #define H_FINDME

diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index 6e3a15b..b15489b 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-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\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/popt.c b/popt/popt.c
index 3fd6361..6c4100c 100644 (file)
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -2,9 +2,9 @@
  * \file popt/popt.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 19982000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist */
 
 #undef MYDEBUG
 

diff --git a/popt/popt.h b/popt/popt.h
index d4dd489..7a0a6b1 100644 (file)
--- a/popt/popt.h
+++ b/popt/popt.h
@@ -2,9 +2,9 @@
  * \file popt/popt.h
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #ifndef H_POPT
 #define H_POPT

diff --git a/popt/popt.spec b/popt/popt.spec
index a417aeb..5c23295 100644 (file)
--- a/popt/popt.spec
+++ b/popt/popt.spec
@@ -4,9 +4,9 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.7
+Version: 1.6.1
 Release: 0.1
-Copyright: LGPL
+Copyright: X Consortium
 Group: System Environment/Libraries
 Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz
 BuildRoot: /var/tmp/%{name}root

diff --git a/popt/poptconfig.c b/popt/poptconfig.c
index 9e50b52..0cfd1a1 100644 (file)
--- a/popt/poptconfig.c
+++ b/popt/poptconfig.c
@@ -2,9 +2,9 @@
  * \file popt/poptconfig.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 #include "poptint.h"

diff --git a/popt/popthelp.c b/popt/popthelp.c
index 8eed7ee..c88d094 100644 (file)
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -4,9 +4,9 @@
  * \file popt/popthelp.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 #include "poptint.h"

diff --git a/popt/poptint.h b/popt/poptint.h
index 39ae3ee..a37a9b9 100644 (file)
--- a/popt/poptint.h
+++ b/popt/poptint.h
@@ -2,9 +2,9 @@
  * \file popt/poptint.h
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #ifndef H_POPTINT
 #define H_POPTINT

diff --git a/popt/poptparse.c b/popt/poptparse.c
index 7a2d505..9133c36 100644 (file)
--- a/popt/poptparse.c
+++ b/popt/poptparse.c
@@ -2,9 +2,9 @@
  * \file popt/poptparse.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 

diff --git a/popt/test1.c b/popt/test1.c
index fdd3a4a..5b6aeb7 100644 (file)
--- a/popt/test1.c
+++ b/popt/test1.c
@@ -1,6 +1,6 @@
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 

diff --git a/rpm.c b/rpm.c
index c63b9e1..5649f74 100755 (executable)
--- a/rpm.c
+++ b/rpm.c
@@ -197,8 +197,8 @@ static void printVersion(void) {
 }
 
 static void printBanner(void) {
-    puts(_("Copyright (C) 1998 - Red Hat Software"));
-    puts(_("This may be freely redistributed under the terms of the GNU GPL"));
+    puts(_("Copyright (C) 1998-2000 - Red Hat, Inc."));
+    puts(_("This program may be freely redistributed under the terms of the GNU GPL"));
 }
 
 static void printUsage(void) {

diff --git a/rpm.spec.in b/rpm.spec.in
index 4d527be..fa30ffd 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -1,7 +1,7 @@
 %define        with_python_subpackage  @WITH_PYTHON_SUBPACKAGE@
 %define        with_bzip2              @WITH_BZIP2@
 %define        with_apidocs            @WITH_APIDOCS@
-%define strip_binaries         0
+%define strip_binaries         1
 
 # XXX legacy requires './' payload prefix to be omitted from rpm packages.
 %define        _noPayloadPrefix        1
@@ -315,6 +315,7 @@ fi
 - handle install chroot's identically throughout the install process.
 - add rpmlib(HeaderLoadSortsTags) for tracking header regions "just in case".
 - create _tmppath on the fly if not present.
+- remove /etc/rpm/macros.db1 configuration file if db3 rebuilt.
 
 * Wed Dec 13 2000 Jeff Johnson <jbj@redhat.com>
 - bump popt version.

diff --git a/rpmqv.c b/rpmqv.c
index aef9dbc..2a226c9 100755 (executable)
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -281,8 +281,8 @@ static void printVersion(void) {
 }
 
 static void printBanner(void) {
-    puts(_("Copyright (C) 1998 - Red Hat Software"));
-    puts(_("This may be freely redistributed under the terms of the GNU GPL"));
+    puts(_("Copyright (C) 1998-2000 - Red Hat, Inc."));
+    puts(_("This program may be freely redistributed under the terms of the GNU GPL"));
 }
 
 static void printUsage(void) {

diff --git a/scripts/trpm b/scripts/trpm
index c3eefec..09bd28c 100755 (executable)
--- a/scripts/trpm
+++ b/scripts/trpm
@@ -5,11 +5,11 @@ dbg=  # echo
 rpm=/bin/rpm
 rpmb=/usr/bin/rpmbuild
 rpmq=/usr/bin/rpmquery
-rpmdb=/usr/bin/rpmdb
+rpmdb=$rpm
 
 dist=7.0
 type=min
-arch=`$rpm --eval '%{_arch}'`
+arch=`$rpmq --eval '%{_arch}'`
 
 top=`pwd`
 root=$top/$dist
@@ -20,7 +20,7 @@ db1=
 rc="--rcfile $top/rpmrc-$dist"
 sorted=        # "| sort"
 
-minglob="
+min0glob="
 basesystem-
 bash-[12]
 filesystem-
@@ -33,7 +33,7 @@ termcap-
 "
 
 min1glob="
-$minglob
+$min0glob
 bzip2-[01]
 chkconfig-
 db1-1
@@ -56,6 +56,7 @@ procps-2
 psmisc-
 sed-
 shadow-utils-
+readline-2
 rmt-
 tar-
 textutils-
@@ -81,6 +82,7 @@ words-
 baseglob="
 $min2glob
 console-tools-
+gmp-2
 initscripts-
 kernel-2
 modutils-
@@ -102,8 +104,10 @@ db2-devel-
 db3-devel-
 gdbm-devel-
 glibc-devel-
+gmp-devel-
 kernel-headers-
 ncurses-devel-
+readline-devel-
 tcl-
 zlib-devel-
 "
@@ -119,15 +123,17 @@ db3-utils-
 egcs-2
 gcc-2
 gettext-
+krb5-configs-
 krb5-libs-
 libstdc++-
 libtool-
 make-
 m4-
 perl-
+python-1
 tcsh-
 "
-classes="min min1 min2 base devel build"
+classes="min0 min1 min2 base devel build"
 notallpat="(kernel-[^2h])"
 
 for cmd in $*
@@ -141,7 +147,9 @@ do
        dist=$cmd
        root=$top/$dist
        rc="--rcfile $top/rpmrc-$dist $db1"
-       $dbg mkdir -p $root/{X/tmp,X/RPMS,X/SRPMS} || exit 1
+       $dbg mkdir -p $root/{dev,X/RPMS,X/SRPMS}
+       [ ! -c $root/dev/null ] && $dbg $sudo mknod $root/dev/null c 1 3
+       find $root
        cat << EOF > $top/rpmrc-$dist
 include:    /usr/lib/rpm/rpmrc
 macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:$top/macros:$top/macros-$dist-$arch
@@ -209,7 +217,7 @@ EOF
            echo $type-$dist-$arch not found
            exit 1
        }
-       $dbg $sudo $rpm $rc --root $root $cmd `cat $type-$dist-$arch`
+       $dbg $sudo $rpm $rc --root $root $cmd --notriggers `cat $type-$dist-$arch`
        ;;
     -[Vqei]*|--showrc)
        $dbg $sudo $rpm $rc --root $root $cmd