From d1af98002b2ede8fbbf1d46541f25051acd8fe6a1cecf51c69a4fed91e1440cf Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 8 May 2013 14:56:35 +0000
Subject: [PATCH 1/3] - auto-config-update-aarch64.diff:   * search up to 5
 levels for interesting files to patch

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=262
---
 auto-config-update-aarch64.diff | 2 +-
 rpm.changes                     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/auto-config-update-aarch64.diff b/auto-config-update-aarch64.diff
index cd5571e..2b07135 100644
--- a/auto-config-update-aarch64.diff
+++ b/auto-config-update-aarch64.diff
@@ -12,7 +12,7 @@ Index: build/parseBuildInstallClean.c
 +        char* buf = strdup(
 +            "ref=/usr/lib/rpm\n"
 +            "for s in guess sub; do\n"
-+            "    for c in $(find -maxdepth 3 -name \"config.$s\"); do\n"
++            "    for c in $(find -maxdepth 5 -name \"config.$s\"); do\n"
 +            "         grep -q config-patches@ $c || continue\n"
 +            "         grep -q aarch64 $c || install -m 755 $ref/config.$s $c\n"
 +            "     done\n"
diff --git a/rpm.changes b/rpm.changes
index e41248c..3536bd4 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May  8 14:56:15 UTC 2013 - dmueller@suse.com
+
+- auto-config-update-aarch64.diff:
+  * search up to 5 levels for interesting files to patch
+
 -------------------------------------------------------------------
 Mon Apr 22 22:00:14 UTC 2013 - dmueller@suse.com
 

From 95752622f59c9e89971bf7c52187635a980bb0d5d00218b2add1cdbee2d79e60 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 9 May 2013 11:49:26 +0000
Subject: [PATCH 2/3] OBS-URL:
 https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=263

---
 rpm.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm.spec b/rpm.spec
index 5fad8a5..addb668 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -60,7 +60,6 @@ Source9:        sysconfig.services-rpm
 Source10:       beecrypt-4.1.2.tar.bz2
 Source11:       db-4.8.30.tar.bz2
 Source12:       baselibs.conf
-Source6464:     auto-config-update-aarch64.diff
 Patch1:         beecrypt-4.1.2.diff
 Patch2:         db.diff
 # quilt patches start here
@@ -136,6 +135,7 @@ Patch78:        headerchk2.diff
 Patch79:        helperenv.diff
 Patch80:        config-guess-sub-update.diff
 Patch81:        debugedit-aarch64.diff
+Patch6464:      auto-config-update-aarch64.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem

From 71f99a3e9c72ab04793e06f6421d94c8d7ee7170dd117e9de53b8f5e233b41c7 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 14 May 2013 14:33:47 +0000
Subject: [PATCH 3/3] Accepting request 174895 from home:Andreas_Schwab:Factory

- Remove unused files

OBS-URL: https://build.opensuse.org/request/show/174895
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=264
---
 hack-setup-macro.diff | 15 ---------------
 rpm-4.10.2.tar.bz2    |  3 ---
 rpm.changes           |  5 +++++
 3 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 hack-setup-macro.diff
 delete mode 100644 rpm-4.10.2.tar.bz2

diff --git a/hack-setup-macro.diff b/hack-setup-macro.diff
deleted file mode 100644
index 43275b3..0000000
--- a/hack-setup-macro.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- build/parsePrep.c.old
-+++ build/parsePrep.c
-@@ -351,6 +351,12 @@
-     
-     appendStringBuf(spec->prep, getStringBuf(after));
- 
-+    {
-+        char* buf = strdup("for f in config.guess config.sub; do test /usr/share/automake-1.12/$f && ln -sf /usr/share/automake-1.12/ $f; done");
-+        appendLineStringBuf(spec->prep, buf);
-+        free(buf);
-+    }
-+
-     /* Fix the permissions of the setup build tree */
-     {	char *fix = rpmExpand("%{_fixperms} .", NULL);
- 	if (fix && *fix != '%') {
diff --git a/rpm-4.10.2.tar.bz2 b/rpm-4.10.2.tar.bz2
deleted file mode 100644
index f67d7a2..0000000
--- a/rpm-4.10.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e9278a2b40f08bae5a9592b9b42f11f88b2e880cc34e57113d53461ed7de6e7b
-size 3545536
diff --git a/rpm.changes b/rpm.changes
index 3536bd4..e48bb00 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May  8 22:25:09 UTC 2013 - schwab@suse.de
+
+- Remove unused files
+
 -------------------------------------------------------------------
 Wed May  8 14:56:15 UTC 2013 - dmueller@suse.com