From e7d807efbed3755648ff3ee50cbb767e237ef4d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 8 Dec 2016 20:51:30 +0000
Subject: [PATCH] fixed rpm signing

---
 ChangeLog            |  5 +++++
 bootstrap.sh         |  2 +-
 build-in-docker.conf |  5 +----
 build-in-docker.sh   | 12 +++++++++---
 mrw-c++.spec.in      |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 18eb311..f0dd68b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-08 17:40  
+
+	* [r456] ChangeLog, ax_init_standard_project.m4:
+	  debian/changelog does not allow tabs
+
 2016-12-08 15:02  
 
 	* [r455] ax_init_standard_project.m4, build-in-docker.sh:
diff --git a/bootstrap.sh b/bootstrap.sh
index 53ba559..5c09ac1 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1534,7 +1534,7 @@ else
 fi)
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
+BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, gpg, rpm-sign,rpm-build$(
     if testtag AX_USE_CXX; then
       echo -n ", binutils-devel, gcc-c++"
     fi
diff --git a/build-in-docker.conf b/build-in-docker.conf
index 8677ae9..65e4815 100644
--- a/build-in-docker.conf
+++ b/build-in-docker.conf
@@ -1,4 +1 @@
-repos+=("Debian|Ubuntu-precise::::::universe")
-repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
-envs+=("-e 'HOME=${HOME}'")
-dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro")
\ No newline at end of file
+repos+=("Ubuntu:::universe")
diff --git a/build-in-docker.sh b/build-in-docker.sh
index a91745a..b5116d9 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -11,7 +11,7 @@ img="ubuntu:latest"
 repos=()
 keys=()
 envs=("-e HOME=/home/$(id -un)" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
-dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:/home/$(id -un)/.gnupg:ro")
+dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:/home/$(id -un)/.gnupg")
 packages=()
 targets="all check distcheck"
 commands=()
@@ -243,7 +243,7 @@ case $mode in
         done
         docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh
         ;;
-    (rpm|yum|dnf|zypper)
+    (rpm|yum|dnf|zypper|urpmi)
         if [[ "$img" =~ "centos" ]]; then
             docker exec ${DOCKER_ID} yum install -y redhat-lsb
             docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' <<EOF
@@ -261,7 +261,13 @@ EOF
             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 ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig wget
+        i=0
+        for repo in "${repos[@]}"; do
+            INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo true))
+            ifthenelse "${repo}" "${INSTALL_REPO} ARG"
+            ((++i))
+        done
         docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -c
         TGZFILE=$(grep PACKAGE_STRING= configure | sed "s, ,-,g;s,PACKAGE_STRING=',,g;s,',.tar.gz,g")
         touch $TGZFILE
diff --git a/mrw-c++.spec.in b/mrw-c++.spec.in
index 3b12eda..7adda3f 100644
--- a/mrw-c++.spec.in
+++ b/mrw-c++.spec.in
@@ -5,7 +5,7 @@ Release: @BUILD_NUMBER@%{?dist}
 License: LGPL
 Group: Development/Libraries/C++
 Source0: %{name}-%{version}.tar.gz
-BuildRequires: rpm-build, subversion, automake, autoconf, doxygen, java-openjdk, libtool, binutils-devel, gcc-c++
+BuildRequires: rpm-build, gpg, rpm-sign, subversion, automake, autoconf, doxygen, java-openjdk, libtool, binutils-devel, gcc-c++
 %if 0%{?fedora} != 20
 BuildRequires: graphviz
 %endif