diff --git a/.files b/.files
index f0aa441..6305838 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index ea1b87f..d0cb7f4 100644
--- a/.rev
+++ b/.rev
@@ -2182,4 +2182,21 @@ See bugzilla 1167537 for the gory details.
- Fix verification of DSA2 signatures with libgrcypt [bnc#1165731]
793802
+
+ 6d103b0d44c5718ae74d1ffd507f12fd
+ 4.15.1
+
+ dimstar_suse
+ - temporarily back out change of %_libexecdir to /usr/libexec
+
+- Update rpmconfigcheck: Remove bashism and use /bin/sh instead of
+ /bin/bash.
+
+- update auto-config-update-aarch64-ppc64le.diff (bsc#1170849):
+ * only update if hostarch isn't there
+
+- Remove ocaml-find-provides.sh, ocaml-find-requires.sh, fileattrs/ocaml.attr
+ ocaml(NAME) = HASH is now handled in ocaml-rpm-macros (bsc#1154874)
+ 817222
+
diff --git a/auto-config-update-aarch64-ppc64le.diff b/auto-config-update-aarch64-ppc64le.diff
index 5d61865..3ad440c 100644
--- a/auto-config-update-aarch64-ppc64le.diff
+++ b/auto-config-update-aarch64-ppc64le.diff
@@ -1,6 +1,6 @@
--- ./build/parseSpec.c.orig 2019-10-02 12:38:51.836127743 +0000
+++ ./build/parseSpec.c 2019-10-02 12:52:33.818447657 +0000
-@@ -926,7 +926,24 @@ static rpmSpec parseSpec(const char *spe
+@@ -926,7 +926,22 @@ static rpmSpec parseSpec(const char *spe
&(spec->buildrequires));
break;
case PART_BUILD:
@@ -12,13 +12,11 @@
+ }
+ spec->build = newStringBuf();
+ appendLineStringBuf(spec->build,
-+ "ref=/usr/lib/rpm\n"
++ "ref=/usr/lib/rpm; testarch=$(uname -m)\n"
+ "for s in guess sub; do\n"
+ " for c in $(find -maxdepth 8 -name \"config.$s\"); do\n"
+ " 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"
++ " grep -q $testarch\\[-:\\] $c || install -m 755 $ref/config.$s $c\n"
+ " done\n"
+ "done\n"
+ );
diff --git a/rpm.changes b/rpm.changes
index 0f82168..cbd19c7 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,4 +1,21 @@
-------------------------------------------------------------------
+Thu Jun 18 18:32:16 UTC 2020 - Dirk Mueller
+
+- temporarily back out change of %_libexecdir to /usr/libexec
+
+-------------------------------------------------------------------
+Mon May 4 13:11:34 UTC 2020 - Dominique Leuenberger
+
+- Update rpmconfigcheck: Remove bashism and use /bin/sh instead of
+ /bin/bash.
+
+-------------------------------------------------------------------
+Thu Apr 30 12:16:46 UTC 2020 - Dirk Mueller
+
+- update auto-config-update-aarch64-ppc64le.diff (bsc#1170849):
+ * only update if hostarch isn't there
+
+-------------------------------------------------------------------
Tue Apr 14 11:50:49 CEST 2020 - mls@suse.de
- Fix verification of DSA2 signatures with libgrcypt [bnc#1165731]
@@ -44,6 +61,12 @@ Wed Feb 26 09:08:19 UTC 2020 - Fabian Vogt
as those might lead to missing files in the package
-------------------------------------------------------------------
+Thu Feb 20 20:20:20 UTC 2020 - ohering@suse.de
+
+- Remove ocaml-find-provides.sh, ocaml-find-requires.sh, fileattrs/ocaml.attr
+ ocaml(NAME) = HASH is now handled in ocaml-rpm-macros (bsc#1154874)
+
+-------------------------------------------------------------------
Fri Jan 17 11:27:17 CET 2020 - mls@suse.de
- Use libgcrypt as crypto library instead of beecrypt
diff --git a/rpm.spec b/rpm.spec
index ef53e8e..1fcac83 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -223,7 +223,7 @@ Requires: python3-base
%description build-python
Provides and requires generator for .py files and modules.
-
+
%package build-perl
Summary: RPM dependency generator for Perl
Group: Development/Languages/Perl
@@ -256,7 +256,7 @@ cp config.guess config.sub db/dist/
%patch -P 70 -P 71 -P 73 -P 75 -P 77 -P 78
%patch -P 85
%patch -P 93 -P 94 -P 99
-%patch -P 100 -P 102 -P 103
+%patch -P 100 -P 102 -P 103
%patch -P 109 -P 117
%patch -P 118 -P 119 -P 120 -P 121 -P 122 -P 123 -P 124 -P 125
@@ -356,6 +356,7 @@ chmod 755 %{buildroot}/etc/rpm
# remove some nonsense or non-working scripts
pushd %{buildroot}/usr/lib/rpm/
for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh \
+ ocaml-find-provides.sh ocaml-find-requires.sh fileattrs/ocaml.attr \
magic magic.mgc magic.mime* rpmfile *.pl javadeps brp-redhat \
brp-strip-static-archive vpkg-provides*.sh http.req sql.req tcl.req \
brp-sparc64-linux brp-strip-comment-note brp-java-gcjcompile
diff --git a/rpmconfigcheck b/rpmconfigcheck
index 8427395..317a065 100644
--- a/rpmconfigcheck
+++ b/rpmconfigcheck
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
# Copyright (c) 2002 SUSE GmbH Nuernberg, Germany.
#
# Author: Michael Schroeder
@@ -15,7 +15,7 @@ if test -s $packages -a \( ! -e $configcheckfile -o -s $configcheckfile -o ! $pa
test -e $configcheckfile && mv -f $configcheckfile $configcheckfile.old
rpm -qalc | sort | while read line; do
for suffix in new orig save; do
- [[ -e "${line}.rpm${suffix}" ]] && echo "${line}.rpm${suffix}"
+ [ -e "${line}.rpm${suffix}" ] && echo "${line}.rpm${suffix}"
done
done > $configcheckfile
else