From 69e0ecaa4ff488dd906ac7bee652624bd4758ce541115bfbb4b10838bf5135c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Thu, 15 Feb 2018 12:14:27 +0000
Subject: [PATCH] Accepting request 576971 from home:Andreas_Schwab:Factory

- auto-config-update-aarch64-ppc64le.diff: Update for riscv64 and enable
  it there

OBS-URL: https://build.opensuse.org/request/show/576971
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=444
---
 auto-config-update-aarch64-ppc64le.diff | 3 ++-
 python-rpm.spec                         | 2 +-
 rpm.changes                             | 6 ++++++
 rpm.spec                                | 6 +++---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/auto-config-update-aarch64-ppc64le.diff b/auto-config-update-aarch64-ppc64le.diff
index ee68fc3..f7ab7f5 100644
--- a/auto-config-update-aarch64-ppc64le.diff
+++ b/auto-config-update-aarch64-ppc64le.diff
@@ -2,7 +2,7 @@ Index: build/parseBuildInstallClean.c
 ===================================================================
 --- build/parseBuildInstallClean.c.orig
 +++ build/parseBuildInstallClean.c
-@@ -46,7 +46,22 @@ int parseBuildInstallClean(rpmSpec spec,
+@@ -46,7 +46,23 @@ int parseBuildInstallClean(rpmSpec spec,
      } else if (rc < 0) {
  	goto exit;
      }
@@ -16,6 +16,7 @@ Index: build/parseBuildInstallClean.c
 +            "         grep -q config-patches@ $c || continue\n"
 +            "         grep -q aarch64 $c || install -m 755 $ref/config.$s $c\n"
 +            "         grep -q ppc64le $c || install -m 755 $ref/config.$s $c\n"
++            "         grep -q 'riscv64[-:]' $c || install -m 755 $ref/config.$s $c\n"
 +            "     done\n"
 +            "done\n"
 +        );
diff --git a/python-rpm.spec b/python-rpm.spec
index 2915945..d361560 100644
--- a/python-rpm.spec
+++ b/python-rpm.spec
@@ -22,7 +22,7 @@ Version:        4.14.1
 Release:        0
 #!BuildIgnore:  rpmlint-Factory
 Summary:        Python Bindings for Manipulating RPM Packages
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Libraries/Python
 Source99:       rpm.spec
 BuildRequires:  file-devel
diff --git a/rpm.changes b/rpm.changes
index ecda162..6bb725f 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 15 11:11:21 UTC 2018 - schwab@suse.de
+
+- auto-config-update-aarch64-ppc64le.diff: Update for riscv64 and enable
+  it there
+
 -------------------------------------------------------------------
 Wed Feb 14 10:45:25 CET 2018 - mls@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index b074fba..ad940ea 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -49,7 +49,7 @@ BuildRequires:  zlib-devel
 Provides:       rpminst
 Requires(post): %fillup_prereq
 Summary:        The RPM Package Manager
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Packages
 Version:        4.14.1
 Release:        0
@@ -229,7 +229,7 @@ rm -f rpmdb/db.h
 %patch -P 100        -P 102 -P 103                             -P 108
 %patch -P 109 -P 111 -P 112
 
-%ifarch aarch64 ppc64le
+%ifarch aarch64 ppc64le riscv64
 %patch6464
 %endif
 
@@ -352,7 +352,7 @@ for i in /usr/share/automake-*/*; do
   fi
 done
 popd
-%ifarch aarch64 ppc64le
+%ifarch aarch64 ppc64le riscv64
 install -m 755 config.guess %{buildroot}/usr/lib/rpm
 install -m 755 config.sub %{buildroot}/usr/lib/rpm
 %endif