- fix: noLibio = 0 on Red Hat 4.x and 5.x.

- fix: typo in autodeps/linux.req.

CVS patchset: 3630
CVS date: 2000/03/15 19:50:57

diff --git a/CHANGES b/CHANGES
index cfdf700..4e1ed36 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -75,6 +75,8 @@
        - portability: splats in rpm.spec to find /usr/{share,lib}/locale/* .
        - fix: better filter in linux.req to avoid ARM specific objdump output.
        - fix: use glibc 2.1 glob/fnmatch everywhere.
+       - fix: noLibio = 0 on Red Hat 4.x and 5.x.
+       - fix: typo in autodeps/linux.req.
 
 3.0.2 -> 3.0.3
        - add --eval to find result of macro expansion.

diff --git a/autodeps/linux.req b/autodeps/linux.req
index 6841ebe..fda723b 100644 (file)
--- a/autodeps/linux.req
+++ b/autodeps/linux.req
@@ -34,7 +34,7 @@ for f in $liblist $exelist ; do
            sub(/:/, "", $3);
            LIBNAME=$3;
        }
-       (START==1) && (LIBNAME!="") && ($4~=/^GLIBC_*/) { print LIBNAME "(" $4 ")"; }
+       (START==1) && (LIBNAME!="") && ($4~/^GLIBC_*/) { print LIBNAME "(" $4 ")"; }
        /^$/ { START=0; }
     '
 done | sort -u

diff --git a/rpm.c b/rpm.c
index 43b47f6..e0b7a02 100755 (executable)
--- a/rpm.c
+++ b/rpm.c
@@ -142,7 +142,7 @@ static struct poptOption optionsTable[] = {
  { "nodeps", '\0', 0, &noDeps, 0,              NULL, NULL},
  { "nodirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 1,        NULL, NULL},
  { "nogpg", '\0', 0, &noGpg, 0,                        NULL, NULL},
-#if HAVE_LIBIO_H
+#if HAVE_LIBIO_H && defined(_IO_BAD_SEEN)
  { "nolibio", '\0', POPT_ARG_VAL, &noLibio, 1,         NULL, NULL},
 #endif
  { "nomd5", '\0', 0, &noMd5, 0,                        NULL, NULL},
@@ -597,7 +597,7 @@ int main(int argc, const char ** argv)
     justdb = 0;
     noDeps = 0;
     noGpg = 0;
-#if HAVE_LIBIO_H
+#if HAVE_LIBIO_H && defined(_IO_BAD_SEEN)
     noLibio = 0;
 #else
     noLibio = 1;