- add ignore-auxv.diff:

* avoid auxv parsing for any platform other than powerpc
- add config-guess-sub-update.diff
  * update config.guess/sub for aarch64 support

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=249

hack-setup-macro.diff

@@ -0,0 +1,15 @@
+--- 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 != '%') {

ignore-auxv.diff

@@ -0,0 +1,33 @@
+--- lib/rpmrc.c
++++ lib/rpmrc.c
+@@ -79,10 +79,12 @@
+     int localize;
+ };
+ 
++#if defined(__linux__) && defined(__powerpc__)
+ static struct rpmat_s {
+     const char *platform;
+     uint64_t hwcap;
+ } rpmat;
++#endif
+ 
+ typedef struct defaultEntry_s {
+     char * name;
+@@ -907,7 +909,7 @@
+ #endif
+ 
+ 
+-#if defined(__linux__)
++#if defined(__linux__) && defined(__powerpc__)
+ /**
+  * Populate rpmat structure with parsed info from /proc/self/auxv
+  */
+@@ -957,7 +959,7 @@
+     canonEntry canon;
+     int rc;
+ 
+-#if defined(__linux__)
++#if defined(__linux__) && defined(__powerpc__)
+     /* Populate rpmat struct with hw info */
+     parse_auxv();
+ #endif

rpm.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Feb 15 15:29:25 UTC 2013 - dmueller@suse.com
+
+- add ignore-auxv.diff:
+  * avoid auxv parsing for any platform other than powerpc
+- add config-guess-sub-update.diff
+  * update config.guess/sub for aarch64 support
+
+
 -------------------------------------------------------------------
 Thu Jan 10 12:04:15 UTC 2013 - coolo@suse.com
 

rpm.spec

@@ -65,6 +65,7 @@ Patch2:         db.diff
 # quilt patches start here
 Patch10:        rpm-beecrypt.diff
 Patch11:        debugedit.diff
+Patch13:        ignore-auxv.diff
 Patch12:        localetag.diff
 Patch14:        nameversioncompare.diff
 Patch15:        dbfsync.diff
@@ -132,6 +133,7 @@ Patch76:        python3-abi-kind.diff
 Patch77:        langnoc.diff
 Patch78:        headerchk2.diff
 Patch79:        helperenv.diff
+Patch80:        config-guess-sub-update.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
@@ -211,13 +213,16 @@ chmod -R u+w db/*
 # will get linked from db3
 rm -f rpmdb/db.h
 %patch -P 1 -P 2
-%patch -P 10 -P 11 -P 12       -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
+%patch -P 10 -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 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
+%patch -P 80
+cp config.guess config.sub db/dist/
+cp config.guess config.sub beecrypt/
 #chmod 755 scripts/find-supplements{,.ksyms}
 #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 #chmod 755 scripts/firmware.prov