development/bootstrap-build-environment
1
0
Fork 0
Code Issues Pull Requests Releases Activity

rpm builds improved and fixed

Browse Source
This commit is contained in:
Marc Wäckerlin
2017-05-30 13:23:27 +00:00
parent ecbaea1832
commit 530693add0
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/ax_init_standard_project.m4
View File

@@ -225,6 +225,9 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_') VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
AX_SUBST(VENDOR) AX_SUBST(VENDOR)
DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null) 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) AX_SUBST(DISTRO)
ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm)) ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))
AX_SUBST(ARCH) AX_SUBST(ARCH)

17
scripts/bootstrap.sh
View File

@@ -1603,7 +1603,7 @@ to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
Summary: @DESCRIPTION@ Summary: @DESCRIPTION@
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
Version: @VERSION@ Version: @VERSION@
Release: @BUILD_NUMBER@%{?dist} Release: @BUILD_NUMBER@.@DISTRO@
License: LGPL License: LGPL
Group: $(if testtag AX_USE_LIBTOOL; then Group: $(if testtag AX_USE_LIBTOOL; then
echo Development/Libraries/C++; echo Development/Libraries/C++;
@@ -1617,9 +1617,6 @@ BuildRequires: which, pkgconfig, gnupg, expect, ${VCSDEPENDS_RPM}make, automake,
if testtag AX_USE_CXX; then if testtag AX_USE_CXX; then
echo -n ", binutils-devel, gcc-c++" echo -n ", binutils-devel, gcc-c++"
fi fi
if testtag AX_USE_LIBTOOL; then
echo -n ", libtool, libtool-ltdl-devel"
fi
if testtag AX_USE_CPPUNIT; then if testtag AX_USE_CPPUNIT; then
echo -n ", cppunit-devel" echo -n ", cppunit-devel"
fi fi
@@ -1638,13 +1635,25 @@ BuildRequires: which, pkgconfig, gnupg, expect, ${VCSDEPENDS_RPM}make, automake,
%if 0%{?suse_version} || 0%{?sles_version} %if 0%{?suse_version} || 0%{?sles_version}
BuildRequires: lsb-release BuildRequires: lsb-release
%else %else
%if 0%{?mageia}
BuildRequires: rpm-sign, lsb-release
%else
BuildRequires: rpm-sign, redhat-lsb BuildRequires: rpm-sign, redhat-lsb
%endif %endif
%endif
$( $(
if testtag AX_USE_DOXYGEN; then cat <<EOS if testtag AX_USE_DOXYGEN; then cat <<EOS
%if ! 0%{?centos} %if ! 0%{?centos}
BuildRequires: mscgen BuildRequires: mscgen
%endif %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 EOS
fi) fi)

2
scripts/resolve-rpmbuilddeps.sh
View File

@@ -14,7 +14,7 @@ INSTALL_TOOL=${INSTALL_TOOL:-$((test -x /usr/bin/zypper && echo zypper install -
SCHROOTNAME="$1" SCHROOTNAME="$1"
PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac) PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac)
TRAP_CMD= TRAP_CMD="sleep ${SLEEP:-0};"
DEPS= DEPS=
for f in BUILD BUILDROOT RPMS SPECS SRPMS; do for f in BUILD BUILDROOT RPMS SPECS SRPMS; do
if ! test -d $f; then if ! test -d $f; then