From 530693add0abc4268cccb13e1e7dafd9b46d1c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Tue, 30 May 2017 13:23:27 +0000
Subject: [PATCH] rpm builds improved and fixed

---
 scripts/ax_init_standard_project.m4 |  3 +++
 scripts/bootstrap.sh                | 17 +++++++++++++----
 scripts/resolve-rpmbuilddeps.sh     |  4 ++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/scripts/ax_init_standard_project.m4 b/scripts/ax_init_standard_project.m4
index 21ef49c..f705156 100644
--- a/scripts/ax_init_standard_project.m4
+++ b/scripts/ax_init_standard_project.m4
@@ -225,6 +225,9 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
   AX_SUBST(VENDOR)
   DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
+  if test "${DISTRO}" = "n/a"; then
+     DISTRO="${VENDOR}_$(lsb_release -sr 2>/dev/null | tr ' ' '_')"
+  fi
   AX_SUBST(DISTRO)
   ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))
   AX_SUBST(ARCH)
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 97417b2..80bf194 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1603,7 +1603,7 @@ to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
 Summary: @DESCRIPTION@
 Name: @PACKAGE_NAME@
 Version: @VERSION@
-Release: @BUILD_NUMBER@%{?dist}
+Release: @BUILD_NUMBER@.@DISTRO@
 License: LGPL
 Group: $(if testtag AX_USE_LIBTOOL; then
   echo Development/Libraries/C++;
@@ -1617,9 +1617,6 @@ BuildRequires: which, pkgconfig, gnupg, expect, ${VCSDEPENDS_RPM}make, automake,
     if testtag AX_USE_CXX; then
       echo -n ", binutils-devel, gcc-c++"
     fi
-    if testtag AX_USE_LIBTOOL; then
-      echo -n ", libtool, libtool-ltdl-devel"
-    fi
     if testtag AX_USE_CPPUNIT; then
       echo -n ", cppunit-devel"
     fi
@@ -1638,13 +1635,25 @@ BuildRequires: which, pkgconfig, gnupg, expect, ${VCSDEPENDS_RPM}make, automake,
 %if 0%{?suse_version} || 0%{?sles_version}
 BuildRequires: lsb-release
 %else
+%if  0%{?mageia}
+BuildRequires: rpm-sign, lsb-release
+%else
 BuildRequires: rpm-sign, redhat-lsb
 %endif
+%endif
 $(
     if testtag AX_USE_DOXYGEN; then cat <<EOS
 %if ! 0%{?centos}
 BuildRequires: mscgen
 %endif
+EOS
+    fi
+    if testtag AX_USE_LIBTOOL; then cat <<EOS
+%if 0%{?mageia}
+BuildRequires: libtool, libltdl-devel
+%else
+BuildRequires: libtool, libtool-ltdl-devel
+%endif
 EOS
     fi)
 
diff --git a/scripts/resolve-rpmbuilddeps.sh b/scripts/resolve-rpmbuilddeps.sh
index dd565a6..4a64ada 100755
--- a/scripts/resolve-rpmbuilddeps.sh
+++ b/scripts/resolve-rpmbuilddeps.sh
@@ -14,7 +14,7 @@ INSTALL_TOOL=${INSTALL_TOOL:-$((test -x /usr/bin/zypper && echo zypper install -
 SCHROOTNAME="$1"
 PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac)
 
-TRAP_CMD=
+TRAP_CMD="sleep ${SLEEP:-0};"
 DEPS=
 for f in BUILD BUILDROOT RPMS SPECS SRPMS; do
   if ! test -d $f; then
@@ -48,7 +48,7 @@ if test -e ${PACKAGE_NAME}.spec.in -a ! -e ${PACKAGE_NAME}.spec; then
     TRAP_CMD+="rm ${PACKAGE_NAME}.spec;"
     trap "${TRAP_CMD}" INT TERM EXIT
     sed 's,@\(\(ALL\|RPM\)_DEPEND_IFEXISTS\|\(ALL\|RPM\)_BUILD_DEPEND\|\(ALL\|RPM\)_DEPEND\)@,,g' ${PACKAGE_NAME}.spec.in | \
-        sed 's,@[^@]*@, dummytext,g' > ${PACKAGE_NAME}.spec
+        sed 's,@[^@]*@,dummytext,g' > ${PACKAGE_NAME}.spec
 fi
 
 TGZFILE=$(sed -n '/^Name: */{s///;h};/^Version: */{s///;H;x;s/\n/-/;s/$/.tar.gz/;p}' ${PACKAGE_NAME}.spec)