From 59c3cc06642295084898b9bb9ce67504a71b8a46 Mon Sep 17 00:00:00 2001
From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Date: Mon, 23 Aug 2021 10:11:11 -0700
Subject: [PATCH] [Ubuntu upgrade][rnp] Make build work on Ubuntu 20.04.
 (#6278)

Copy all versions of the libjson shared object and install python
instead of python-minimal.

Related #6180.
---
 projects/rnp/Dockerfile | 2 +-
 projects/rnp/build.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/rnp/Dockerfile b/projects/rnp/Dockerfile
index c82713bef..008286078 100755
--- a/projects/rnp/Dockerfile
+++ b/projects/rnp/Dockerfile
@@ -27,7 +27,7 @@ RUN apt-get install -y \
     zlib1g-dev \
     libjson-c-dev \
     build-essential \
-    python-minimal \
+    python \
     wget
 
 RUN git clone --depth 1 https://github.com/rnpgp/rnp.git rnp
diff --git a/projects/rnp/build.sh b/projects/rnp/build.sh
index 1bfd8aa5f..95439b6dc 100755
--- a/projects/rnp/build.sh
+++ b/projects/rnp/build.sh
@@ -62,4 +62,4 @@ done
 mkdir -p "${OUT}/lib"
 cp src/lib/librnp.so.0 "${OUT}/lib/"
 cp /usr/lib/libbotan-2.so.16 "${OUT}/lib/"
-cp /lib/x86_64-linux-gnu/libjson-c.so.2 "${OUT}/lib/"
+cp /lib/x86_64-linux-gnu/libjson-c.so.* "${OUT}/lib/"