From 918995921d7ff8136b7a0b16095c8e24404e4ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 8 Dec 2016 10:00:02 +0000
Subject: [PATCH] fixed update problem in mageia

---
 ChangeLog          | 17 +++++++++++++++++
 build-in-docker.sh |  7 ++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e582a78..c96a1b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2016-12-07 20:34  
+
+	* [r453] bootstrap.sh, build-in-docker.sh:
+	  typo
+
+2016-12-07 20:21  
+
+	* [r452] build-in-docker.sh, mrw-c++.spec.in,
+	  resolve-rpmbuilddeps.sh:
+	  tested on mageia 5 :)
+
+2016-12-07 19:28  
+
+	* [r451] ChangeLog, bootstrap.sh, build-in-docker.sh,
+	  debian/control.in, mrw-c++.spec.in, resolve-rpmbuilddeps.sh:
+	  tested on fedora, centos, opensuse and ubuntu
+
 2016-12-07 15:59  
 
 	* [r450] bootstrap.sh, build-in-docker.sh, configure.ac,
diff --git a/build-in-docker.sh b/build-in-docker.sh
index bdb5196..a6a9ab6 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -158,7 +158,8 @@ function traperror() {
                 read
             fi
             echo -n "   ... cleanup docker: "
-            docker rm -f "${DOCKER_ID}"
+            docker stop "${DOCKER_ID}" || true
+            docker rm "${DOCKER_ID}"
             echo "returning status: $e"
             echo "--->"
             exit $e
@@ -255,6 +256,10 @@ enabled=1
 gpgcheck=0
 EOF
         fi
+        UPDATE_TOOL=$(test -x /usr/sbin/urpmi && echo urpmi.update -a)
+        if test -n "${UPDATE_TOOL}"; then
+            docker exec ${DOCKER_ID} ${UPDATE_TOOL}
+        fi
         INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) ||  (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto))
         docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig
         docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -c