From 2d34280948359dcade45ec1d78711049d6a04332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Tue, 30 May 2017 13:23:23 +0000 Subject: [PATCH] rpm builds improved and fixed --- ChangeLog | 5 +++++ ax_init_standard_project.m4 | 3 +++ bootstrap.sh | 24 +++++++++++++++++------- mrw-c++.spec.in | 13 +++++++++++-- resolve-rpmbuilddeps.sh | 4 ++-- 5 files changed, 38 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d59efcb..3d76d0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-05-24 11:39 + + * [r474] ChangeLog, mrw-c++.spec.in: + fixed rpm build + 2017-05-23 13:11 * [r473] mrw-c++.spec.in: diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index d5a09a6..d163010 100644 --- a/ax_init_standard_project.m4 +++ b/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/bootstrap.sh b/bootstrap.sh index 21e2183..146227a 100755 --- a/bootstrap.sh +++ b/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)