From aaa0f549d6e66c8715b836d0b75d2e3d62a00b0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 8 Dec 2016 15:02:56 +0000
Subject: [PATCH] fixed debian changelog, rpm package signing and mageia update

---
 ax_init_standard_project.m4 | 5 +++--
 build-in-docker.sh          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 7425450..9b3c21c 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -196,7 +196,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   CHANGELOG=$(<ChangeLog)
   AC_SUBST(CHANGELOG)
   _AM_SUBST_NOTMAKE([CHANGELOG])
-  DEB_CHANGELOG=$(sed '/^[[^\t]]/{h;N;d};/^\t\* /{s,,,;H;g;s,^,\t* ,;s,\n\([[^ ]]*\) *, \1\n\t  ,}' 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"
   fi
@@ -206,7 +206,7 @@ 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 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
+  PACKAGER=$(gpg -K --lock-never 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
   if -z "${PACKAGER}"; then
     PACKAGER="$AUTHOR"
   fi
@@ -560,6 +560,7 @@ AC_DEFUN([AX_USE_RPM_PACKAGING], [
 EXTRA_DIST += \${PACKAGE_NAME}.spec.in
 rpm: dist
 	rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec
+	rpmsign --define "_gpg_name \${PACKAGER}" --addsign RPMS/*/*.rpm SRPMS/*.rpm
 clean-rpm-targets:
 	-rm -rf BUILD BUILDROOT RPMS SPECS SRPMS
 distclean-rpm-targets:
diff --git a/build-in-docker.sh b/build-in-docker.sh
index a6a9ab6..a91745a 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -256,7 +256,7 @@ enabled=1
 gpgcheck=0
 EOF
         fi
-        UPDATE_TOOL=$(test -x /usr/sbin/urpmi && echo urpmi.update -a)
+        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