From ee9a78d3faf781d1acc07f9ae6be54ee10e57f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Fri, 9 Dec 2016 08:26:10 +0000
Subject: [PATCH] improved build

---
 ChangeLog          | 11 +++++++++++
 bootstrap.sh       |  4 ++--
 build-in-docker.sh | 20 +++++++++-----------
 mrw-c++.spec.in    |  4 ++--
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f0dd68b..847bf1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2016-12-08 21:11  
+
+	* [r458] mrw-c++.spec.in:
+	  fix mageia dependency
+
+2016-12-08 20:51  
+
+	* [r457] ChangeLog, bootstrap.sh, build-in-docker.conf,
+	  build-in-docker.sh, mrw-c++.spec.in:
+	  fixed rpm signing
+
 2016-12-08 17:40  
 
 	* [r456] ChangeLog, ax_init_standard_project.m4:
diff --git a/bootstrap.sh b/bootstrap.sh
index 5c09ac1..49546f9 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, gpg, rpm-sign,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/build-in-docker.sh b/build-in-docker.sh
index b5116d9..1f102b6 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -10,7 +10,7 @@ mode="deb"
 img="ubuntu:latest"
 repos=()
 keys=()
-envs=("-e HOME=/home/$(id -un)" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
+envs=("-e LANG=${LANG}" "-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")
 packages=()
 targets="all check distcheck"
@@ -208,6 +208,8 @@ if ! [[ $arch =~ $myarch ]]; then
     docker cp "/usr/bin/qemu-${arch}-static" "${DOCKER_ID}:/usr/bin/qemu-${arch}-static"
 fi
 docker start "${DOCKER_ID}"
+docker exec ${DOCKER_ID} locale-gen ${LANG}
+docker exec ${DOCKER_ID} update-locale LANG=${LANG}
 if ! docker exec ${DOCKER_ID} getent group $(id -g) > /dev/null 2>&1; then
     docker exec ${DOCKER_ID} groupadd -g $(id -g) $(id -gn)
 fi
@@ -256,18 +258,14 @@ enabled=1
 gpgcheck=0
 EOF
         fi
-        UPDATE_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi.update -a) || true)
-        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 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
diff --git a/mrw-c++.spec.in b/mrw-c++.spec.in
index 336725c..82acf51 100644
--- a/mrw-c++.spec.in
+++ b/mrw-c++.spec.in
@@ -5,13 +5,13 @@ Release: @BUILD_NUMBER@%{?dist}
 License: LGPL
 Group: Development/Libraries/C++
 Source0: %{name}-%{version}.tar.gz
-BuildRequires: rpm-build, rpm-sign, subversion, automake, autoconf, doxygen, java-openjdk, libtool, binutils-devel, gcc-c++
+BuildRequires: rpm-build, subversion, automake, autoconf, doxygen, java-openjdk, libtool, binutils-devel, gcc-c++
 %if 0%{?fedora} != 20
 BuildRequires: graphviz
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} || 0%{?mageia}
-BuildRequires: which, pkgconfig, cppunit-devel
+BuildRequires: which, pkgconfig, cppunit-devel, rpm-sign
 %if 0%{?mageia}
 BuildRequires: lsb-release, libltdl-devel
 %else