From 530693add0abc4268cccb13e1e7dafd9b46d1c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= 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 < ${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)