From 7a08c44ceea74e4afedc9fdf10ca6e3423832522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Fri, 9 Dec 2016 12:12:10 +0000
Subject: [PATCH] fix some build issues, i.e. pgp utf-8

---
 ChangeLog                   | 6 ++++++
 ax_init_standard_project.m4 | 4 ++--
 bootstrap.sh                | 4 ++--
 build-in-docker.sh          | 4 ++--
 configure.ac                | 1 +
 resolve-debbuilddeps.sh     | 2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 847bf1d..ae0a0e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-09 08:26  
+
+	* [r459] ChangeLog, bootstrap.sh, build-in-docker.sh,
+	  mrw-c++.spec.in:
+	  improved build
+
 2016-12-08 21:11  
 
 	* [r458] mrw-c++.spec.in:
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 73b5d04..9b78951 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -206,8 +206,8 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AUTHOR_NAME=$(echo $AUTHOR | sed 's, *[[<(]].*$,,')
   AUTHOR_URL=$(echo $AUTHOR | sed 's,.*(\(http[[^)]]*\)).*,\1,')
   AUTHOR_MAIL=$(echo $AUTHOR | sed 's,.*<\(.*@.*\)>.*,\1,')
-  PACKAGER=$(gpg -K --lock-never 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
-  if -z "${PACKAGER}"; then
+  PACKAGER=$(gpg -K --display-charset utf-8 --lock-never 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
+  if test -z "${PACKAGER}"; then
     PACKAGER="$AUTHOR"
   fi
   AX_SUBST(AUTHOR)
diff --git a/bootstrap.sh b/bootstrap.sh
index 49546f9..e145478 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-sign, rpm-build$(
+BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
     if testtag AX_USE_CXX; then
       echo -n ", binutils-devel, gcc-c++"
     fi
@@ -1552,7 +1552,7 @@ BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-sign, rpm-buil
 $(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
 %endif
 %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} || 0%{?mageia}
-BuildRequires: which, pkgconfig$(
+BuildRequires: which, rpm-sign, pkgconfig$(
     if testtag AX_USE_LIBTOOL; then
       echo -n ", cppunit-devel"
     fi
diff --git a/build-in-docker.sh b/build-in-docker.sh
index 1f102b6..db5d561 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -208,8 +208,6 @@ 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
@@ -218,6 +216,8 @@ if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
 fi
 case $mode in
     (deb|apt)
+        docker exec ${DOCKER_ID} locale-gen ${LANG}
+        docker exec ${DOCKER_ID} update-locale LANG=${LANG}
         OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
         for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
             docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"
diff --git a/configure.ac b/configure.ac
index d534aee..ad8e02e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
+PROJECT_URL="https://dev.marc.waeckerlin.org/projects/mrw-c++"
 m4_define(x_package_name, mrw-c++) # project's name
 m4_define(x_major, 4) # project's major version
 m4_define(x_minor, 4) # project's minor version
diff --git a/resolve-debbuilddeps.sh b/resolve-debbuilddeps.sh
index 5ce3dd5..94c1ba1 100755
--- a/resolve-debbuilddeps.sh
+++ b/resolve-debbuilddeps.sh
@@ -35,7 +35,7 @@ TO_INSTALL=
 
 if test -e debian/control.in -a ! -e debian/control; then
     for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
-        if test -n "$(${DO} apt-cache policy -q ${f})" && ! "$(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')" && ! ${DO} dpkg -l "${f}"; then
+        if test -n "$(${DO} apt-cache policy -q ${f})" && ((! $(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')) && (! ${DO} dpkg -l "${f}")); then
             TO_INSTALL+=" ${f}"
         fi
     done