mc-rpmfs.patch

   1 diff -uNr mc-4.5.54.orig/vfs/extfs/rpm mc-4.5.54/vfs/extfs/rpm
   2 --- mc-4.5.54.orig/vfs/extfs/rpm        Mon May 14 10:56:08 2001
   3 +++ mc-4.5.54/vfs/extfs/rpm     Mon May 14 10:38:34 2001
   4 @@ -35,7 +35,11 @@
   5      echo "-r-xr-xr-x   1 root     root    39 $DATE INSTALL"
   6      echo "-r-xr-xr-x   1 root     root    39 $DATE UPGRADE"
   7      echo "dr-xr-xr-x   3 root     root    0 $DATE INFO"
   8 -    echo "$FILEPREF 0 $DATE INFO/NAME-VERSION-RELEASE"
   9 +    if [ "`rpm -qp --qf \"%{SERIAL}\" \"$1\"`" = "(none)" ]; then
  10 +       echo "$FILEPREF 0 $DATE INFO/NAME-VERSION-RELEASE"
  11 +    else
  12 +       echo "$FILEPREF 0 $DATE INFO/NAME-SERIAL:VERSION-RELEASE"
  13 +    fi
  14      echo "$FILEPREF 0 $DATE INFO/GROUP"
  15      echo "$FILEPREF 0 $DATE INFO/BUILDHOST"
  16      echo "$FILEPREF 0 $DATE INFO/SOURCERPM"
  17 @@ -102,11 +106,14 @@
  18         echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
  19      rpm -qp --qf "[%{OBSOLETES}\n]" "$1" | grep "(none)" > /dev/null ||
  20         echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
  21 +    rpm -qp --qf "[%{CONFLICTS}\n]" "$1" | grep "(none)" > /dev/null ||
  22 +       echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
  23      rpm -qp --qf "[%{PROVIDES}\n]" "$1" | grep "(none)" > /dev/null ||
  24         echo "$FILEPREF 0 $DATE INFO/PROVIDES"
  25      test "`rpm -qp --qf \"%{CHANGELOGTEXT}\" \"$1\"`" = "(none)" ||
  26         echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
  27      else
  28 +       echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
  29         echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
  30         echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
  31         echo "$FILEPREF 0 $DATE INFO/PROVIDES"
  32 @@ -124,7 +131,10 @@
  33         INSTALL) echo "# Run this to install this RPM package" > "$3"; exit 0;;
  34         UPGRADE) echo "# Run this to upgrade this RPM package" > "$3"; exit 0;;
  35         ERROR) rpm -qip "$1" > /dev/null 2> "$3"; exit 0;;
  36 -       INFO/NAME-VERSION-RELEASE)      rpm -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" "$1" > "$3"; exit 0;;
  37 +       INFO/NAME-VERSION-RELEASE)
  38 +               rpm -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" "$1" > "$3"; exit 0;;
  39 +       INFO/NAME-SERIAL:VERSION-RELEASE)
  40 +               rpm -qp --qf "%{NAME}-%{SERIAL}:%{VERSION}-%{RELEASE}\n" "$1" > "$3"; exit 0;;
  41         INFO/RELEASE)           rpm -qp --qf "%{RELEASE}\n" "$1" > "$3"; exit 0;;
  42         INFO/GROUP)             rpm -qp --qf "%{GROUP}\n" "$1" > "$3"; exit 0;;
  43         INFO/DISTRIBUTION)      rpm -qp --qf "%{DISTRIBUTION}\n" "$1" > "$3"; exit 0;;
  44 @@ -139,27 +149,32 @@
  45         INFO/COPYRIGHT)         rpm -qp --qf "%{COPYRIGHT}\n" "$1" >"$3"; exit 0;;
  46         INFO/RPMVERSION)        rpm -qp --qf "%{RPMVERSION}\n" "$1" >"$3"; exit 0;;
  47         INFO/REQUIRENAME)       rpm -qp --qf "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" "$1" >"$3"; exit 0;;
  48 +       INFO/OBSOLETES)         rpm -qp --qf "[%{OBSOLETES}\n]" "$1" >"$3"; exit 0;;
  49 +       INFO/CONFLICTS)         rpm -qp --qf "[%{CONFLICTS}\n]" "$1" >"$3"; exit 0;;
  50         INFO/PROVIDES)          rpm -qp --qf "[%{PROVIDES}\n]" "$1" >"$3"; exit 0;;
  51         INFO/SCRIPTS/PREIN)     rpm -qp --qf "%{RPMTAG_PREIN}\n" "$1" >"$3"; exit 0;;
  52         INFO/SCRIPTS/POSTIN)    rpm -qp --qf "%{RPMTAG_POSTIN}\n" "$1" >"$3"; exit 0;;
  53         INFO/SCRIPTS/PREUN)     rpm -qp --qf "%{RPMTAG_PREUN}\n" "$1" >"$3"; exit 0;;
  54         INFO/SCRIPTS/POSTUN)    rpm -qp --qf "%{RPMTAG_POSTUN}\n" "$1" >"$3"; exit 0;;
  55 -       INFO/SCRIPTS/VERIFYSCRIPT)      rpm -qp --qf "%{VERIFYSCRIPT}\n" "$1" >"$3"; exit 0;;
  56 +       INFO/SCRIPTS/VERIFYSCRIPT)
  57 +               rpm -qp --qf "%{VERIFYSCRIPT}\n" "$1" >"$3"; exit 0;;
  58 +       INFO/SCRIPTS/TRIGGERSCRIPTS)
  59 +               rpm -qp --triggers "$1" > "$3"; exit 0;;
  60         INFO/SCRIPTS/ALL)               rpm -qp --scripts "$1" > "$3"; exit 0;;
  61         INFO/SUMMARY)           rpm -qp --qf "%{SUMMARY}\n" "$1" > "$3"; exit 0;;
  62         INFO/OS)                rpm -qp --qf "%{OS}\n" "$1" > "$3"; exit 0;;
  63         INFO/CHANGELOG)         rpm -qp --qf "[* %{CHANGELOGTIME:date} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]\n" "$1" > "$3"; exit 0;;
  64         INFO/SIZE)              rpm -qp --qf "%{SIZE} bytes\n" "$1" > "$3"; exit 0;;
  65 +       CONTENTS.cpio)          rpm2cpio "$1" > "$3"; exit 0;;
  66         *)
  67 -           TMPDIR=/tmp/mctmpdir.$$
  68 +           TMPDIR=${TMPDIR:-/tmp}/mctmpdir.$$
  69             mkdir $TMPDIR || exit 1
  70             cd $TMPDIR
  71 -           rpm2cpio "$1" | cpio -iumd --quiet "$2" >/dev/null
  72 -           mv "$2" "$3"
  73 +           rpm2cpio "$1" | cpio -iumd --quiet "$2" "./$2" >/dev/null
  74 +           mv -f "$2" "$3"
  75             cd /
  76             rm -rf $TMPDIR;;
  77
  78 -       CONTENTS.cpio)          rpm2cpio "$1" > "$3"; exit 0;;
  79      esac
  80  }
  81