- added --enable-largefile to %%configure

- merged rpmfs_rpm40 patch into rpmfs patch (patching same file),
  removed unnecessary second "VERIFYSCRIPT" case
- release 2

Changed files:
    mc-rpmfs.patch -> 1.13
    mc-rpmfs_rpm40.patch -> 1.3
    mc.spec -> 1.115

diff --git a/mc-rpmfs.patch b/mc-rpmfs.patch
index 0c880d4669c4b4635a66c83f054cdadba62bb825..a381443a0b87964b8fde9089fbe77eaa284862e1 100644 (file)
--- a/mc-rpmfs.patch
+++ b/mc-rpmfs.patch
@@ -1,5 +1,6 @@
---- mc-4.5.55/vfs/extfs/rpm.orig       Thu Apr 19 22:51:41 2001
-+++ mc-4.5.55/vfs/extfs/rpm    Sun Sep 16 04:10:20 2001
+diff -Nur mc-4.5.55.orig/vfs/extfs/rpm mc-4.5.55/vfs/extfs/rpm
+--- mc-4.5.55.orig/vfs/extfs/rpm       Thu Apr 19 22:51:41 2001
++++ mc-4.5.55/vfs/extfs/rpm    Thu Sep 27 18:57:20 2001
 @@ -35,7 +35,11 @@
      echo "-r-xr-xr-x   1 root     root    39 $DATE INSTALL"
      echo "-r-xr-xr-x   1 root     root    39 $DATE UPGRADE"
@@ -13,7 +14,7 @@
      echo "$FILEPREF 0 $DATE INFO/GROUP"
      echo "$FILEPREF 0 $DATE INFO/BUILDHOST"
      echo "$FILEPREF 0 $DATE INFO/SOURCERPM"
-@@ -102,11 +106,14 @@
+@@ -102,18 +106,21 @@
        echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
      rpm -qp --qf "[%{OBSOLETES}\n]" "$1" | grep "(none)" > /dev/null ||
        echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
@@ -28,19 +29,24 @@
        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;;
+         echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
+     fi
+ 
+-    rpm2cpio "$1" | cpio -tv --quiet
++    rpm -qlvp "$1" | sed -e 's/^\(..........\)[-t]* /\1 /'
+     echo "$FILEPREF 0 $DATE CONTENTS.cpio"
+ }
+ 
+@@ -125,6 +132,8 @@
        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-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,25 +149,31 @@
+@@ -139,12 +148,15 @@
        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;;
@@ -52,15 +58,11 @@
        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/ALL)               rpm -qp --scripts "$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/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;;
+@@ -152,12 +164,12 @@
        INFO/SIZE)              rpm -qp --qf "%{SIZE} bytes\n" "$1" > "$3"; exit 0;;
        CONTENTS.cpio)          rpm2cpio "$1" > "$3"; exit 0;;
        *)

diff --git a/mc-rpmfs_rpm40.patch b/mc-rpmfs_rpm40.patch
deleted file mode 100644 (file)
index 1366582..0000000
--- a/mc-rpmfs_rpm40.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mc-4.5.55/vfs/extfs/rpm.orig       Sun Sep 16 04:25:30 2001
-+++ mc-4.5.55/vfs/extfs/rpm    Sun Sep 16 04:26:56 2001
-@@ -120,7 +120,7 @@
-         echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
-     fi
- 
--    rpm2cpio "$1" | cpio -tv --quiet
-+    rpm -qlvp "$1" | sed -e 's/^\(..........\)[-t]* /\1 /'
-     echo "$FILEPREF 0 $DATE CONTENTS.cpio"
- }
- 

diff --git a/mc.spec b/mc.spec
index 9ddbcc8e045146620ab872b3f0d99cb8dc7f2e96..10902d081d727e263acb40534f865bad5168271e 100644 (file)
--- a/mc.spec
+++ b/mc.spec
@@ -12,7 +12,7 @@ Summary(pl):  Midnight Commander - pow
 Summary(tr):   Midnight Commander görsel kabuðu
 Name:          mc
 Version:       4.5.55
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/Shells
 Group(de):     Applikationen/Shells
@@ -32,15 +32,14 @@ Patch4:             %{name}-gdeskpopt.patch
 Patch5:                %{name}-prototype.patch
 Patch6:                %{name}-gnome-editor.patch
 Patch7:                %{name}-def_config.patch
-Patch8:                %{name}-rpmfs_rpm40.patch
-Patch9:                %{name}-mouse_in_rxvt.patch
-Patch10:       %{name}-proxy.patch
-Patch11:       %{name}-nognome-amfix.patch
-Patch12:       %{name}-urar.patch
-Patch13:       %{name}-samba.patch
-Patch14:       %{name}-nobashism.patch
-Patch15:       %{name}-tinfo.patch
-Patch16:       %{name}-vfs.patch
+Patch8:                %{name}-mouse_in_rxvt.patch
+Patch9:                %{name}-proxy.patch
+Patch10:       %{name}-nognome-amfix.patch
+Patch11:       %{name}-urar.patch
+Patch12:       %{name}-samba.patch
+Patch13:       %{name}-nobashism.patch
+Patch14:       %{name}-tinfo.patch
+Patch15:       %{name}-vfs.patch
 URL:           http://www.gnome.org/mc/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -197,7 +196,6 @@ nie jest ona jeszcze sko
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
 
 %build
 gettextize --copy --force
@@ -224,6 +222,7 @@ fi"
        %{?_with_x:--with-tm-x-support} \
        --without-debug \
        --with-included-slang \
+       --enable-largefile \
        --enable-mcserv-install \
        %{!?_without_gnome:--with-gnome}%{?_without_gnome:--without-gnome} \
        %{?_with_samba:--with-samba}