From 327c7f43c3cd0f05323a32b4483840984a8b57047ea63ff14711980392b5453b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Fri, 12 Jul 2013 15:55:33 +0000
Subject: [PATCH] - delete files.diff patch, it caused more harm than good

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=277
---
 build.diff  | 15 +--------------
 files.diff  | 17 -----------------
 rpm.changes |  1 +
 rpm.spec    |  3 +--
 4 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 files.diff

diff --git a/build.diff b/build.diff
index 4f35489..43a1d99 100644
--- a/build.diff
+++ b/build.diff
@@ -14,20 +14,7 @@
  cat Makefile.orig | sed -e '/^install[:-]/c\
 --- installplatform
 +++ installplatform
-@@ -95,6 +95,12 @@
- 	CANONARCH=arm
- 	CANONCOLOR=0
- 	;;
-+    aarch64*)
-+	ISANAME=aarchh
-+	 ISABITS=64
-+	 CANONARCH=aarch64
-+	 CANONCOLOR=3
-+	 ;;
-     alpha*)
- 	ISANAME=alpha
- 	ISABITS=64
-@@ -118,6 +124,11 @@
+@@ -118,6 +118,11 @@
    PPD="${DESTDIR}/${platformdir}/${ARCH}-${OS}"
    [ -d $PPD ] || mkdir -p $PPD
  
diff --git a/files.diff b/files.diff
deleted file mode 100644
index 32c6fa2..0000000
--- a/files.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Print "unpackaged files" section even if there was an error
-in the filelist.
-
---- ./build/files.c.orig	2011-05-11 15:27:11.000000000 +0000
-+++ ./build/files.c	2011-05-11 15:29:12.000000000 +0000
-@@ -2149,10 +2149,10 @@ rpmRC processBinaryFiles(rpmSpec spec, r
-      */
-     
-     
-+exit:
-     if (checkFiles(spec->buildRoot, check_fileList) > 0) {
- 	rc = RPMRC_FAIL;
-     }
--exit:
-     check_fileList = freeStringBuf(check_fileList);
-     
-     return rc;
diff --git a/rpm.changes b/rpm.changes
index a68347b..cb0e149 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -11,6 +11,7 @@ Fri Jul 12 15:36:43 CEST 2013 - mls@suse.de
 - package rpmdb_* database tools
 - get rid of kernel symbol requires/provides, instead add simple
   package provides/requires like in Fedora
+- delete files.diff patch, it caused more harm than good
 
 -------------------------------------------------------------------
 Tue Jul  2 09:53:02 UTC 2013 - dmueller@suse.com
diff --git a/rpm.spec b/rpm.spec
index 734cd9d..a4005ed 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -92,7 +92,6 @@ Patch36:        rpmqpack.diff
 Patch37:        convertdb1static.diff
 Patch38:        build.diff
 Patch39:        modalias-kernel_module.diff
-Patch40:        files.diff
 Patch41:        debugedit-comp-dir.diff
 Patch42:        perlprov.diff
 Patch43:        rpm-shorten-changelog.diff
@@ -216,7 +215,7 @@ rm -f rpmdb/db.h
 %patch       -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
 %patch -P 20 -P 21 -P 22 -P 23 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39
-%patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49
+%patch       -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49
 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79