From 474937df179b3d96b70cbec43fc19a283e131dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Fri, 9 Dec 2016 07:11:24 +0000
Subject: [PATCH] rpm development

---
 scripts/ax_init_standard_project.m4 |  2 +-
 scripts/bootstrap.sh                |  4 ++--
 scripts/build-in-docker.sh          | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/ax_init_standard_project.m4 b/scripts/ax_init_standard_project.m4
index 640b5e1..b98b25e 100644
--- a/scripts/ax_init_standard_project.m4
+++ b/scripts/ax_init_standard_project.m4
@@ -198,7 +198,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   _AM_SUBST_NOTMAKE([CHANGELOG])
   DEB_CHANGELOG=$(sed '/^[[^\t]]/{h;N;d};s,\t,  ,g;/^  \* /{s,,,;H;g;s,^,  * ,;s,\n\([[^ ]]*\) *, \1\n    ,}' ChangeLog)
   if test -z "$DEB_CHANGELOG"; then
-    DEB_CHANGELOG="	* see file ChangeLog and project management web site"
+    DEB_CHANGELOG="  * see file ChangeLog and project management web site"
   fi
   AC_SUBST(DEB_CHANGELOG)
   _AM_SUBST_NOTMAKE([DEB_CHANGELOG])
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index a3b3e80..0a2b095 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/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, rpm-sign, rpm-build$(
     if testtag AX_USE_CXX; then
       echo -n ", binutils-devel, gcc-c++"
     fi
@@ -1564,7 +1564,7 @@ BuildRequires: lsb-release$(
     fi
 )
 %else
-BuildRequires: redhat-lsb$(
+BuildRequires: gpg, redhat-lsb$(
     if testtag AX_USE_LIBTOOL; then
       echo -n ", libtool-ltdl-devel"
     fi
diff --git a/scripts/build-in-docker.sh b/scripts/build-in-docker.sh
index 367d125..d05e135 100755
--- a/scripts/build-in-docker.sh
+++ b/scripts/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=()
@@ -262,12 +262,12 @@ EOF
         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 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
+        #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