- removed mem patch as it breaks sort-merge/batch-size test

diff --git a/coreutils-mem.patch b/coreutils-mem.patch
deleted file mode 100644 (file)
index f81bf9d..0000000
--- a/coreutils-mem.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- coreutils-4.5.3/lib/physmem.c.orig Fri Nov 16 10:20:25 2001
-+++ coreutils-4.5.3/lib/physmem.c      Sun Oct 27 22:35:25 2002
-@@ -31,6 +31,14 @@
- # include <sys/pstat.h>
- #endif
- 
-+/* Cap physical memory to something sane */
-+static double
-+physmem_cap (double mem)
-+{
-+  double max = 1 << (sizeof(void *)*8 - 4);
-+  return mem > max ? max : mem;
-+}
-+
- /* Return the total amount of physical memory.  */
- double
- physmem_total (void)
-@@ -40,7 +48,7 @@
-     double pages = sysconf (_SC_PHYS_PAGES);
-     double pagesize = sysconf (_SC_PAGESIZE);
-     if (0 <= pages && 0 <= pagesize)
--      return pages * pagesize;
-+      return physmem_cap(pages * pagesize);
-   }
- #endif
- 
-@@ -106,7 +106,7 @@
-         double pages = pss.physical_memory;
-         double pagesize = pss.page_size;
-         if (0 <= pages && 0 <= pagesize)
--          return pages * pagesize;
-+          return physmem_cap(pages * pagesize);
-       }
-   }
- #endif
-

diff --git a/coreutils.spec b/coreutils.spec
index 49fa1e62bdd0e956f00a5f4fad6782c0e1a5c160..0efe01bb110ea44bd08673ef3f843a5d48f03c31 100644 (file)
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -22,7 +22,6 @@ Patch0:               %{name}-info.patch
 Patch1:                %{name}-getgid.patch
 Patch2:                %{name}-uname-cpuinfo.patch
 Patch3:                %{name}-date-man.patch
-Patch4:                %{name}-mem.patch
 Patch5:                %{name}-7.4-sttytcsadrain.patch
 Patch6:                %{name}-fmt-wchars.patch
 Patch7:                %{name}-sparc64.patch
@@ -108,7 +107,6 @@ Programy zawarte w tym pakiecie to:
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %ifarch sparc64