]> git.pld-linux.org Git - packages/mc.git/blobdiff - mc-rpmfs.patch
projects / packages / mc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- outdated
[packages/mc.git] / mc-rpmfs.patch
diff --git a/mc-rpmfs.patch b/mc-rpmfs.patch
index 2b23dda2a629e77271a1303f21c08b870c7c9171..b06a5fe572e21501c5f9024dd534a91fbe6b3505 100644 (file)
--- a/mc-rpmfs.patch
+++ b/mc-rpmfs.patch
@@ -1,71 +1,93 @@
-diff -Nru mc-4.5.44/vfs/extfs/rpm mc-4.5.44.new/vfs/extfs/rpm
---- mc-4.5.44/vfs/extfs/rpm    Fri Apr  7 05:58:19 2000
-+++ mc-4.5.44.new/vfs/extfs/rpm        Fri Apr  7 05:55:44 2000
-+++ rpm        Sun Apr 22 09:41:18 2001
-@@ -35,7 +35,11 @@
+--- mc-4.7.0-pre2/vfs/extfs/rpm.org    2009-06-15 23:18:22.000000000 +0200
++++ mc-4.7.0-pre2/vfs/extfs/rpm        2009-09-06 18:33:26.968564752 +0200
+@@ -50,7 +50,11 @@
      echo "-r-xr-xr-x   1 root     root    39 $DATE INSTALL"
      echo "-r-xr-xr-x   1 root     root    39 $DATE UPGRADE"
      echo "dr-xr-xr-x   3 root     root           0 $DATE INFO"
 -    echo "$FILEPREF 0 $DATE INFO/NAME-VERSION-RELEASE"
-+    if [ "`rpm -qp --qf \"%{SERIAL}\" \"$1\"`" = "(none)" ]; then
-+      echo "$FILEPREF 0 $DATE INFO/NAME-VERSION-RELEASE"
++    if [ "`$RPM -qp --qf \"%{EPOCH}\" \"$1\"`" = "(none)" ]; then
++          echo "$FILEPREF 0 $DATE INFO/NAME-VERSION-RELEASE"
 +    else
-+      echo "$FILEPREF 0 $DATE INFO/NAME-SERIAL:VERSION-RELEASE"
++          echo "$FILEPREF 0 $DATE INFO/NAME-EPOCH:VERSION-RELEASE"
 +    fi
      echo "$FILEPREF 0 $DATE INFO/GROUP"
      echo "$FILEPREF 0 $DATE INFO/BUILDHOST"
      echo "$FILEPREF 0 $DATE INFO/SOURCERPM"
-@@ -102,11 +106,14 @@
-       echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
-     rpm -qp --qf "[%{OBSOLETES}\n]" "$1" | grep "(none)" > /dev/null ||
-       echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
-+    rpm -qp --qf "[%{CONFLICTS}\n]" "$1" | grep "(none)" > /dev/null ||
-+      echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
-     rpm -qp --qf "[%{PROVIDES}\n]" "$1" | grep "(none)" > /dev/null ||
-       echo "$FILEPREF 0 $DATE INFO/PROVIDES"
-     test "`rpm -qp --qf \"%{CHANGELOGTEXT}\" \"$1\"`" = "(none)" ||
-        echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
-     else 
-+      echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
-       echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
-       echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
-       echo "$FILEPREF 0 $DATE INFO/PROVIDES"
-@@ -124,7 +131,10 @@
-       INSTALL) echo "# Run this to install this RPM package" > "$3"; exit 0;;
+@@ -63,18 +67,32 @@
+          echo "$FILEPREF 0 $DATE INFO/DESCRIPTION"
+      test "`$RPM -qp --qf \"%{SUMMARY}\" \"$f\"`" = "(none)" ||
+          echo "$FILEPREF 0 $DATE INFO/SUMMARY"
+-     if test "`$RPM -qp --qf \"%{RPMTAG_PREIN}%{RPMTAG_POSTIN}%{RPMTAG_PREUN}%{RPMTAG_POSTUN}%{VERIFYSCRIPT}\" \"$f\"`" != "(none)(none)(none)(none)(none)"; then
++     if test "`$RPM -qp --qf \"%{RPMTAG_PREINPROG}%{RPMTAG_POSTINPROG}%{RPMTAG_PREUNPROG}%{RPMTAG_POSTUNPROG}%{VERIFYSCRIPTPROG}%{TRIGGERSCRIPTPROG}\" \"$1\"`" != "(none)(none)(none)(none)(none)"; then
+       echo "dr-xr-xr-x   1 root     root     0 $DATE INFO/SCRIPTS"
+       test "`$RPM -qp --qf \"%{RPMTAG_PREIN}\" \"$f\"`" = '(none)' ||
+          echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREIN"
++      test "`$RPM -qp --qf \"%{RPMTAG_PREINPROG}\" \"$1\"`" = '(none)' ||
++         echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREINPROG"
+       test "`$RPM -qp --qf \"%{RPMTAG_POSTIN}\" \"$f\"`" = '(none)' ||
+          echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTIN"
++      test "`$RPM -qp --qf \"%{RPMTAG_POSTINPROG}\" \"$1\"`" = '(none)' ||
++         echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTINPROG"
+       test "`$RPM -qp --qf \"%{RPMTAG_PREUN}\" \"$f\"`" = '(none)' ||
+          echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREUN"
++      test "`$RPM -qp --qf \"%{RPMTAG_PREUNPROG}\" \"$1\"`" = '(none)' ||
++         echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREUNPROG"
+       test "`$RPM -qp --qf \"%{RPMTAG_POSTUN}\" \"$f\"`" = '(none)' ||
+          echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTUN"
++      test "`$RPM -qp --qf \"%{RPMTAG_POSTUNPROG}\" \"$1\"`" = '(none)' ||
++         echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTUNPROG"
+       test "`$RPM -qp --qf \"%{VERIFYSCRIPT}\" \"$f\"`" = '(none)' ||
+          echo "$FILEPREF 0 $DATE INFO/SCRIPTS/VERIFYSCRIPT"
++      test "`$RPM -qp --qf \"%{VERIFYSCRIPTPROG}\" \"$1\"`" = '(none)' ||
++         echo "$FILEPREF 0 $DATE INFO/SCRIPTS/VERIFYSCRIPTPROG"
++      test "`$RPM -qp --qf \"%{TRIGGERSCRIPTS}\" \"$1\"`" = '(none)' ||
++         echo "$FILEPREF 0 $DATE INFO/SCRIPTS/TRIGGERSCRIPTS"
++      test "`$RPM -qp --qf \"%{TRIGGERSCRIPTPROG}\" \"$1\"`" = '(none)' ||
++         echo "$FILEPREF 0 $DATE INFO/SCRIPTS/TRIGGERSCRIPTPROG"
+         echo "$FILEPREF 0 $DATE INFO/SCRIPTS/ALL"
+      fi
+     else
+@@ -84,10 +102,17 @@
+      echo "$FILEPREF 0 $DATE INFO/SUMMARY"
+      echo "dr-xr-xr-x   1 root     root     0 $DATE INFO/SCRIPTS"
+      echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREIN"
++     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREINPROG"
+      echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTIN"
++     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTINPROG"
+      echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREUN"
++     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREUNPROG"
+      echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTUN"
++     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTUNPROG"
+      echo "$FILEPREF 0 $DATE INFO/SCRIPTS/VERIFYSCRIPT"
++     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/VERIFYSCRIPTPROG"
++     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/TRIGGERSCRIPTS"
++     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/TRIGGERSCRIPTPROG"
+      echo "$FILEPREF 0 $DATE INFO/SCRIPTS/ALL"
+     fi
+     if test "$MCFASTRPM" = 0 ; then
+@@ -140,6 +165,7 @@
        UPGRADE) echo "# Run this to upgrade this RPM package" > "$3"; exit 0;;
-       ERROR) rpm -qip "$1" > /dev/null 2> "$3"; exit 0;;
--      INFO/NAME-VERSION-RELEASE)      rpm -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" "$1" > "$3"; exit 0;;
-+      INFO/NAME-VERSION-RELEASE)
-+              rpm -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" "$1" > "$3"; exit 0;;
-+      INFO/NAME-SERIAL:VERSION-RELEASE)
-+              rpm -qp --qf "%{NAME}-%{SERIAL}:%{VERSION}-%{RELEASE}\n" "$1" > "$3"; exit 0;;
-       INFO/RELEASE)           rpm -qp --qf "%{RELEASE}\n" "$1" > "$3"; exit 0;;
-       INFO/GROUP)             rpm -qp --qf "%{GROUP}\n" "$1" > "$3"; exit 0;;
-       INFO/DISTRIBUTION)      rpm -qp --qf "%{DISTRIBUTION}\n" "$1" > "$3"; exit 0;;
-@@ -139,19 +149,24 @@
-       INFO/COPYRIGHT)         rpm -qp --qf "%{COPYRIGHT}\n" "$1" >"$3"; exit 0;;
-       INFO/RPMVERSION)        rpm -qp --qf "%{RPMVERSION}\n" "$1" >"$3"; exit 0;;
-       INFO/REQUIRENAME)       rpm -qp --qf "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" "$1" >"$3"; exit 0;;
-+      INFO/OBSOLETES)         rpm -qp --qf "[%{OBSOLETES}\n]" "$1" >"$3"; exit 0;;
-+      INFO/CONFLICTS)         rpm -qp --qf "[%{CONFLICTS}\n]" "$1" >"$3"; exit 0;;
-       INFO/PROVIDES)          rpm -qp --qf "[%{PROVIDES}\n]" "$1" >"$3"; exit 0;;
-       INFO/SCRIPTS/PREIN)     rpm -qp --qf "%{RPMTAG_PREIN}\n" "$1" >"$3"; exit 0;;
-       INFO/SCRIPTS/POSTIN)    rpm -qp --qf "%{RPMTAG_POSTIN}\n" "$1" >"$3"; exit 0;;
-       INFO/SCRIPTS/PREUN)     rpm -qp --qf "%{RPMTAG_PREUN}\n" "$1" >"$3"; exit 0;;
-       INFO/SCRIPTS/POSTUN)    rpm -qp --qf "%{RPMTAG_POSTUN}\n" "$1" >"$3"; exit 0;;
--      INFO/SCRIPTS/VERIFYSCRIPT)      rpm -qp --qf "%{VERIFYSCRIPT}\n" "$1" >"$3"; exit 0;;
-+      INFO/SCRIPTS/VERIFYSCRIPT)
-+              rpm -qp --qf "%{VERIFYSCRIPT}\n" "$1" >"$3"; exit 0;;
-+      INFO/SCRIPTS/TRIGGERSCRIPTS)
-+              rpm -qp --triggers "$1" > "$3"; exit 0;;
-       INFO/SCRIPTS/ALL)               rpm -qp --scripts "$1" > "$3"; exit 0;;
-       INFO/SUMMARY)           rpm -qp --qf "%{SUMMARY}\n" "$1" > "$3"; exit 0;;
-       INFO/OS)                rpm -qp --qf "%{OS}\n" "$1" > "$3"; exit 0;;
-       INFO/CHANGELOG)         rpm -qp --qf "[* %{CHANGELOGTIME:date} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]\n" "$1" > "$3"; exit 0;;
-       INFO/SIZE)              rpm -qp --qf "%{SIZE} bytes\n" "$1" > "$3"; exit 0;;
-       *)
--          TMPDIR=/tmp/mctmpdir.$$
-+          TMPDIR=${TMPDIR:-/tmp}/mctmpdir.$$
-           mkdir $TMPDIR || exit 1
-           cd $TMPDIR
-           rpm2cpio "$1" | cpio -iumd --quiet "$2" >/dev/null
+       ERROR) $RPM -qip "$f" > /dev/null 2> "$3"; exit 0;;
+       INFO/NAME-VERSION-RELEASE)      $RPM -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" "$f" > "$3"; exit 0;;
++      INFO/NAME-EPOCH:VERSION-RELEASE) $RPM -qp --qf "%{NAME}-%{EPOCH}:%{VERSION}-%{RELEASE}\n" "$1" > "$3"; exit 0;;
+       INFO/RELEASE)           $RPM -qp --qf "%{RELEASE}\n" "$f" > "$3"; exit 0;;
+       INFO/GROUP)             $RPM -qp --qf "%{GROUP}\n" "$f" > "$3"; exit 0;;
+       INFO/DISTRIBUTION)      $RPM -qp --qf "%{DISTRIBUTION}\n" "$f" > "$3"; exit 0;;
+@@ -156,10 +182,17 @@
+       INFO/REQUIRENAME)       $RPM -qp --qf "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" "$f" >"$3"; exit 0;;
+       INFO/PROVIDES)          $RPM -qp --qf "[%{PROVIDES}\n]" "$f" >"$3"; exit 0;;
+       INFO/SCRIPTS/PREIN)     $RPM -qp --qf "%{RPMTAG_PREIN}\n" "$f" >"$3"; exit 0;;
++      INFO/SCRIPTS/PREINPROG) $RPM -qp --qf "%{RPMTAG_PREINPROG}\n" "$1" >"$3"; exit 0;;
+       INFO/SCRIPTS/POSTIN)    $RPM -qp --qf "%{RPMTAG_POSTIN}\n" "$f" >"$3"; exit 0;;
++      INFO/SCRIPTS/POSTINPROG)        $RPM -qp --qf "%{RPMTAG_POSTINPROG}\n" "$1" >"$3"; exit 0;;
+       INFO/SCRIPTS/PREUN)     $RPM -qp --qf "%{RPMTAG_PREUN}\n" "$f" >"$3"; exit 0;;
++      INFO/SCRIPTS/PREUNPROG) $RPM -qp --qf "%{RPMTAG_PREUNPROG}\n" "$1" >"$3"; exit 0;;
+       INFO/SCRIPTS/POSTUN)    $RPM -qp --qf "%{RPMTAG_POSTUN}\n" "$f" >"$3"; exit 0;;
++      INFO/SCRIPTS/POSTUNPROG)        $RPM -qp --qf "%{RPMTAG_POSTUNPROG}\n" "$1" >"$3"; exit 0;;
+       INFO/SCRIPTS/VERIFYSCRIPT)      $RPM -qp --qf "%{VERIFYSCRIPT}\n" "$f" >"$3"; exit 0;;
++      INFO/SCRIPTS/VERIFYSCRIPTPROG)  $RPM -qp --qf "%{VERIFYSCRIPTPROG}\n" "$1" >"$3"; exit 0;;
++      INFO/SCRIPTS/TRIGGERSCRIPTS)    $RPM -qp --triggers "$1" > "$3"; exit 0;;
++      INFO/SCRIPTS/TRIGGERSCRIPTPROG) $RPM -qp --qf "%{TRIGGERSCRIPTPROG}\n" "$1" > "$3"; exit 0;;
+       INFO/SCRIPTS/ALL)               $RPM -qp --scripts "$f" > "$3"; exit 0;;
+       INFO/SUMMARY)           $RPM -qp --qf "%{SUMMARY}\n" "$f" > "$3"; exit 0;;
+       INFO/OS)                $RPM -qp --qf "%{OS}\n" "$f" > "$3"; exit 0;;
A user-friendly file manager and visual shell
This page took 0.102421 seconds and 4 git commands to generate.